diff --git a/.dockerignore b/.dockerignore index 200c598da7..527874dac7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,7 @@ !.git !.goreleaser* !.golangci* +!.mockery.yaml !build/scripts !cmd !examples diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a5360e1ec6..4268280132 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,7 +21,7 @@ Before you start writing: 2. Download the latest version of eksctl to see whether the problem has already been fixed. For more information on how to open a bug report in eksctl, please refer to our issue submission guide. -https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#opening-issues +https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#opening-issues --> ### What were you trying to accomplish? diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index b46e4c5e41..73ed032ef5 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -14,7 +14,7 @@ In order to help us process this request faster, please provide as much detail a Before creating a feature request, please search existing issues to see if this request has already been made. If there is a similar feature request please up-vote it and/or add your comments to it instead. For more information on how to contribute to eksctl, please refer to our contributing docs. -https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#opening-issues +https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#opening-issues --> ### What feature/behavior/change do you want? diff --git a/.github/ISSUE_TEMPLATE/request-for-help.md b/.github/ISSUE_TEMPLATE/request-for-help.md index d7c2fc2cce..c55f9586d9 100644 --- a/.github/ISSUE_TEMPLATE/request-for-help.md +++ b/.github/ISSUE_TEMPLATE/request-for-help.md @@ -14,7 +14,7 @@ Before creating a new request for help, please search existing issue to see if y If there is a similar feature request please up-vote it and/or add your comments to it instead For more information on how to request help on eksctl, please refer to our community docs. -https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#opening-issues +https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#opening-issues --> ### What help do you need? diff --git a/.github/actions/setup-identity/action.yaml b/.github/actions/setup-identity/action.yaml index 6c3e70027d..9e2216f32d 100644 --- a/.github/actions/setup-identity/action.yaml +++ b/.github/actions/setup-identity/action.yaml @@ -7,11 +7,11 @@ inputs: name: description: "Git config name" required: false - default: "weaveworksbot" + default: "eksctl-bot" email: description: "Git config email" required: false - default: "weaveworksbot@users.noreply.github.com" + default: "53547694+eksctl-bot@users.noreply.github.com" outputs: {} runs: using: "composite" diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 39a96bcba4..b8b40f0005 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -32,7 +32,7 @@ template: | Weaveworks would like to sincerely thank: $CONTRIBUTORS replacers: - - search: '/@(Himangini|TiberiuGC|A-Hilaly|yuxiang-zhang|cPu1|weaveworksbot|dependabot(?:\[bot\])?)(?:,| |$)/gm' + - search: '/@(Himangini|TiberiuGC|a-hilaly|yuxiang-zhang|cPu1|eksctl-bot|dependabot(?:\[bot\])?)(?:,| |$)/gm' replace: '' exclude-labels: - 'skip-release-notes' diff --git a/.github/workflows/build-all-distros-nightly.yaml b/.github/workflows/build-all-distros-nightly.yaml index 2937796640..6afa323a99 100644 --- a/.github/workflows/build-all-distros-nightly.yaml +++ b/.github/workflows/build-all-distros-nightly.yaml @@ -1,7 +1,7 @@ name: Build all distros on: schedule: - - cron: '0 9 * * *' + - cron: '0 9 * * 1-5' workflow_dispatch: {} jobs: @@ -9,21 +9,39 @@ jobs: name: build all distros runs-on: ubuntu-latest steps: + # Clean unnecessary files to save disk space + - name: clean unncessary files to save space + run: | + docker rmi `docker images -q` + sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/sudo apt/sources.list.d + sudo apt -y autoremove --purge + sudo apt -y autoclean + sudo apt clean + rm --recursive --force "$AGENT_TOOLSDIRECTORY" + df -h + # Free up disk space on Ubuntu + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8 #v1.3.0 + with: + # This might remove tools that are actually needed, if set to "true" but frees about 6 GB + tool-cache: false + large-packages: true + swap-storage: true - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: fetch-depth: 0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ ~/go/pkg/mod/ key: ${{ hashFiles('go.sum') }} - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Setup deps run: | make install-build-deps @@ -35,7 +53,7 @@ jobs: make build-all - name: slack on failure if: failure() - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0 with: slack_token: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }} message: ":ahhhhhhhhh: build-all-distros has failed" diff --git a/.github/workflows/cache-dependencies.yaml b/.github/workflows/cache-dependencies.yaml index dd21e7629e..405920243a 100644 --- a/.github/workflows/cache-dependencies.yaml +++ b/.github/workflows/cache-dependencies.yaml @@ -1,3 +1,4 @@ +name: Cache Dependencies on: push: branches: @@ -9,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Go modules - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ diff --git a/.github/workflows/dependabot-bundler.yaml b/.github/workflows/dependabot-bundler.yaml deleted file mode 100644 index ccd79a64b8..0000000000 --- a/.github/workflows/dependabot-bundler.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Dependabot Bundler - -on: workflow_dispatch - -jobs: - bundler: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Go - uses: actions/setup-go@v2 - with: - go-version: 1.18.x - - name: Cache go-build and mod - uses: actions/cache@v3 - with: - path: | - ~/.cache/go-build/ - ~/go/pkg/mod/ - key: go-${{ hashFiles('go.sum') }} - restore-keys: | - go- - - name: Install Dependabot Bundler - run: | - go install github.com/Skarlso/dependabot-bundler@v0.0.10 - - name: Run Dependabot Bundler - run: | - dependabot-bundler --token ${{ secrets.GITHUB_TOKEN }} --repo eksctl --owner weaveworks --labels skip-release-notes,dependencies diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 0a7095ebd3..4fde0356ad 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -10,19 +10,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 #4.6.0 + uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #5.0.0 with: images: weaveworks/eksctl - name: Log in to Docker Hub - uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d #v3.0.0 with: username: weaveworkseksctlci password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Build and push Docker image - uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf #4.1.0 + uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #5.0.0 with: context: . push: true diff --git a/.github/workflows/ecr-publish-build.yaml b/.github/workflows/ecr-publish-build.yaml new file mode 100644 index 0000000000..265c2f00cf --- /dev/null +++ b/.github/workflows/ecr-publish-build.yaml @@ -0,0 +1,52 @@ +name: Publish ECR eksctl-build image + +on: workflow_dispatch + +permissions: + id-token: write + contents: read + +jobs: + build-and-push-to-registry: + name: Build and push container image + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1 + with: + aws-region: us-east-1 + role-duration-seconds: 7200 + role-session-name: eksctl-build-ecr-publisher + role-to-assume: ${{ secrets.ECR_PUBLISH_ROLE_ARN }} + + - name: Login to Amazon ECR Public + id: login-ecr-public + uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v1 + with: + registry-type: public + + - name: Cache go-build and mod + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 + with: + path: | + ~/.cache/go-build/ + ~/go/pkg/mod/ + key: go-${{ hashFiles('go.sum') }} + restore-keys: | + go- + + - name: Setup Go + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 + with: + go-version: 1.20.x + + - name: Setup deps + run: | + make install-build-deps + + - name: Build and push image + run: | + PATH=$PATH:$(go env GOPATH)/bin make -f Makefile.docker push-build-image \ No newline at end of file diff --git a/.github/workflows/ecr-publish.yaml b/.github/workflows/ecr-publish.yaml new file mode 100644 index 0000000000..c8bed6e72c --- /dev/null +++ b/.github/workflows/ecr-publish.yaml @@ -0,0 +1,49 @@ +name: Publish ECR image + +on: + release: + types: [published] + +permissions: + id-token: write + contents: read + +jobs: + build-and-push-to-registry: + name: Build and push container image + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1 + with: + aws-region: us-east-1 + role-duration-seconds: 7200 + role-session-name: eksctl-ecr-publisher + role-to-assume: ${{ secrets.ECR_PUBLISH_ROLE_ARN }} + + - name: Login to Amazon ECR Public + id: login-ecr-public + uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v1 + with: + registry-type: public + + - name: Extract metadata (tags, labels) + id: meta + uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #5.0.0 + env: + REGISTRY: ${{ steps.login-ecr-public.outputs.registry }} + REGISTRY_ALIAS: eksctl + REPOSITORY: eksctl + with: + images: ${{ env.REGISTRY }}/${{ env.REGISTRY_ALIAS }}/${{ env.REPOSITORY }} + + - name: Build and push container image to ECR + uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #5.0.0 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/exclude-file.txt b/.github/workflows/exclude-file.txt index 81fd5e5637..0ec8d637fe 100644 --- a/.github/workflows/exclude-file.txt +++ b/.github/workflows/exclude-file.txt @@ -18,3 +18,4 @@ creating-and-managing-clusters schema.js weave-community.slack.com netlify.com +slack.k8s.io \ No newline at end of file diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 8f2e16294a..ee551b519d 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -9,8 +9,8 @@ jobs: issues: write pull-requests: write steps: - - uses: actions/first-interaction@v1 + - uses: actions/first-interaction@1dbfe1ba5525b8257e1f259b09745bee346d62d8 #v1.2.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: 'Hello ${{ github.event.issue.user.login }} :wave: Thank you for opening an issue in `eksctl` project. The team will review the issue and aim to respond within 1-5 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/weaveworks/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)' - pr-message: 'Hello ${{ github.event.pull_request.user.login }} :wave: Thank you for opening a Pull Request in `eksctl` project. The team will review the Pull Request and aim to respond within 1-10 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/weaveworks/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)' + issue-message: 'Hello ${{ github.event.issue.user.login }} :wave: Thank you for opening an issue in `eksctl` project. The team will review the issue and aim to respond within 1-5 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/eksctl-io/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)' + pr-message: 'Hello ${{ github.event.pull_request.user.login }} :wave: Thank you for opening a Pull Request in `eksctl` project. The team will review the Pull Request and aim to respond within 1-10 business days. Meanwhile, please read about the Contribution and Code of Conduct guidelines [here](https://github.com/eksctl-io/eksctl#contributions). You can find out more information about `eksctl` on our [website](https://eksctl.io)' diff --git a/.github/workflows/link-checker.yaml b/.github/workflows/link-checker.yaml index 002d52793a..c8e2c251f5 100644 --- a/.github/workflows/link-checker.yaml +++ b/.github/workflows/link-checker.yaml @@ -20,15 +20,15 @@ jobs: matrix: python-version: [3.9] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 #v4.7.1 with: python-version: ${{ matrix.python-version }} - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Install doc dependencies run: make install-site-deps - name: Build docs for link check diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index 5819b36ed6..ba0ca432ed 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -10,16 +10,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: - token: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + token: ${{ secrets.EKSCTLBOT_TOKEN }} fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -27,15 +27,15 @@ jobs: key: go-${{ hashFiles('go.sum') }} restore-keys: | go- - - name: Setup identity as weaveworksbot + - name: Setup identity as eksctl-bot uses: ./.github/actions/setup-identity with: - token: "${{ secrets.WEAVEWORKSBOT_TOKEN }}" + token: "${{ secrets.EKSCTLBOT_TOKEN }}" - name: Trigger Netlify deployment run: make publish-docs - name: slack on success if: success() - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0 with: slack_token: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }} message: ":tada: Docs published successfully :tada:" @@ -44,7 +44,7 @@ jobs: verbose: true - name: slack on failure if: failure() - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0 with: slack_token: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }} message: ":ahhhhhhhhh: Docs publishing failed." diff --git a/.github/workflows/publish-release-candidate.yaml b/.github/workflows/publish-release-candidate.yaml index 3e49e24ea3..307e71f03e 100644 --- a/.github/workflows/publish-release-candidate.yaml +++ b/.github/workflows/publish-release-candidate.yaml @@ -15,5 +15,5 @@ jobs: isReleaseCandidate: true name: release candidate secrets: - githubToken: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + githubToken: ${{ secrets.EKSCTLBOT_TOKEN }} slackToken: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }} diff --git a/.github/workflows/publish-release-type.yaml b/.github/workflows/publish-release-type.yaml index bea2f3fd1c..c09e7b0cf4 100644 --- a/.github/workflows/publish-release-type.yaml +++ b/.github/workflows/publish-release-type.yaml @@ -1,3 +1,4 @@ +name: Publish Release type on: workflow_call: inputs: @@ -18,10 +19,18 @@ jobs: name: ${{ inputs.isReleaseCandidate && 'prerelease' || 'release' }} runs-on: ubuntu-latest steps: + - name: Free up disk space + run: | + echo "Available storage:" + df -h && echo + sudo docker image prune --all --force + sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL + echo "Available storage:" + df -h - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -30,9 +39,9 @@ jobs: restore-keys: | go- - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Setup deps run: | make install-build-deps @@ -53,28 +62,28 @@ jobs: run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - name: slack on success - team-pitch-black if: ${{ success() }} - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0 with: slack_token: ${{ secrets.slackToken }} - message: ":cool-doge: ${{ inputs.name }} successful for tag " + message: ":cool-doge: ${{ inputs.name }} successful for tag " channel: team-pitch-black color: green verbose: false - name: slack on failure - team-pitch-black if: ${{ failure() }} - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0 with: slack_token: ${{ secrets.slackToken }} - message: ":ahhhhhhhhh: ${{ inputs.name }} has failed for tag " + message: ":ahhhhhhhhh: ${{ inputs.name }} has failed for tag " channel: team-pitch-black color: red verbose: true - name: slack on success - aws-dev if: ${{ success() }} - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a #v1.1.0 with: slack_token: ${{ secrets.slackToken }} - message: ":tada: released!" + message: ":tada: released!" channel: aws-dev color: green verbose: false diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml index b0d9e17bc8..55c14c237b 100644 --- a/.github/workflows/publish-release.yaml +++ b/.github/workflows/publish-release.yaml @@ -15,5 +15,5 @@ jobs: isReleaseCandidate: false name: release secrets: - githubToken: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + githubToken: ${{ secrets.EKSCTLBOT_TOKEN }} slackToken: ${{ secrets.WEAVEWORKS_SLACK_EKSCTLBOT_TOKEN }} diff --git a/.github/workflows/rebase.yaml b/.github/workflows/rebase.yaml deleted file mode 100644 index 174dc8faea..0000000000 --- a/.github/workflows/rebase.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: PR Rebase -on: - issue_comment: - types: [created] -jobs: - rebase: - name: Rebase - if: | - (github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')) && - (github.event.comment.author_association == 'MEMBER' || github.event.comment.user.login == github.event.pull_request.user.login) - runs-on: ubuntu-latest - steps: - - name: Checkout the latest code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Rebase - uses: cirrus-actions/rebase@1.8 - env: - GITHUB_TOKEN: ${{ secrets.WEAVEWORKSBOT_TOKEN }} diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 8fba7cd1c1..3ebc0239b5 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -7,15 +7,15 @@ jobs: rc: name: Trigger release candidate build runs-on: ubuntu-latest - container: weaveworks/eksctl-build:4639938e287f84b816c3442206436324730eef46 + container: public.ecr.aws/eksctl/eksctl-build:516ded83aa5dbd3e3c4e25c5d410e2dba3b5e668 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: - token: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + token: ${{ secrets.EKSCTLBOT_TOKEN }} fetch-depth: 0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -23,9 +23,9 @@ jobs: key: go-${{ hashFiles('go.sum') }} restore-keys: | go- - - name: Setup identity as weaveworksbot + - name: Setup identity as eksctl-bot uses: ./.github/actions/setup-identity with: - token: "${{ secrets.WEAVEWORKSBOT_TOKEN }}" + token: "${{ secrets.EKSCTLBOT_TOKEN }}" - name: Push tag and open PR to default branch run: make prepare-release-candidate diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index dd7e06547c..7e7b768b7a 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: # Drafts your next Release notes as Pull Requests are merged into "master" - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 #v5.24.0 # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml # with: # config-name: my-config.yml diff --git a/.github/workflows/release-merge.yaml b/.github/workflows/release-merge.yaml index 5c47f1b738..77a74c26f0 100644 --- a/.github/workflows/release-merge.yaml +++ b/.github/workflows/release-merge.yaml @@ -11,27 +11,32 @@ jobs: name: Merge release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: fetch-depth: 0 - - name: Setup identity as weaveworksbot + - name: Setup identity as eksctl-bot uses: ./.github/actions/setup-identity with: token: "${{ secrets.GITHUB_TOKEN }}" - name: Merge release branch into ${{env.DEFAULT_BRANCH}} + id: merge-changes run: | git checkout $DEFAULT_BRANCH git checkout -b merge-${{ github.sha }} - git merge --no-commit --no-ff ${{ github.ref }} + if [ "$(git merge --no-commit --no-ff ${{ github.ref }})" = "Already up to date." ]; then + exit 0; + fi git checkout ORIG_HEAD -- $VERSION_FILE git add $VERSION_FILE EDITOR=true git merge --continue ! git diff --exit-code $DEFAULT_BRANCH...HEAD || exit 1 git push --set-upstream origin HEAD - - uses: actions/github-script@v6.4.1 + echo "changes=true" >> $GITHUB_OUTPUT + - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1 name: Open PR to ${{env.DEFAULT_BRANCH}} + if: steps.merge-changes.outputs.changes == 'true' with: - github-token: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + github-token: ${{ secrets.EKSCTLBOT_TOKEN }} script: | const { data: pr } = await github.pulls.create({ ...context.repo, diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fc52b53860..29af76d383 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,15 +7,15 @@ jobs: rc: name: Trigger release build runs-on: ubuntu-latest - container: weaveworks/eksctl-build:4639938e287f84b816c3442206436324730eef46 + container: public.ecr.aws/eksctl/eksctl-build:516ded83aa5dbd3e3c4e25c5d410e2dba3b5e668 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: - token: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + token: ${{ secrets.EKSCTLBOT_TOKEN }} fetch-depth: 0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -23,9 +23,9 @@ jobs: key: go-${{ hashFiles('go.sum') }} restore-keys: | go- - - name: Setup identity as weaveworksbot + - name: Setup identity as eksctl-bot uses: ./.github/actions/setup-identity with: - token: "${{ secrets.WEAVEWORKSBOT_TOKEN }}" + token: "${{ secrets.EKSCTLBOT_TOKEN }}" - name: Push tag and open PR to default branch run: make prepare-release diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 14e6bca1e6..4cc5826de7 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -4,6 +4,11 @@ on: schedule: - cron: "30 1 * * *" +permissions: + contents: read + issues: write + pull-requests: write + jobs: stale: runs-on: ubuntu-latest diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index ce849c6280..8309c955ef 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: fetch-depth: 0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -23,26 +23,26 @@ jobs: restore-keys: | go- - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Setup deps run: | make install-build-deps - name: Unit test run: | PATH=$PATH:$(go env GOPATH)/bin make build - PATH=$PATH:$(go env GOPATH)/bin make unit-test + PATH=$PATH:$(go env GOPATH)/bin make unit-test-no-generate lint: name: Lint runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: fetch-depth: 0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -51,9 +51,9 @@ jobs: restore-keys: | go- - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Setup deps run: | make install-build-deps @@ -65,11 +65,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: fetch-depth: 0 - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -78,9 +78,9 @@ jobs: restore-keys: | go- - name: Setup Go - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4.0.0 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0 with: - go-version: 1.18.x + go-version: 1.20.x - name: Setup deps run: | make install-build-deps diff --git a/.github/workflows/update-generated.yaml b/.github/workflows/update-generated.yaml index 47c3034336..b0de3a0acb 100644 --- a/.github/workflows/update-generated.yaml +++ b/.github/workflows/update-generated.yaml @@ -4,24 +4,43 @@ on: schedule: - cron: "0 5 * * Thu" +permissions: + id-token: write + env: DEFAULT_BRANCH: main jobs: - update_aws_node: - name: Update aws-node and open PR + update_generated_file: + strategy: + fail-fast: false + matrix: + resource: ["coredns", "aws-node"] + name: Update ${{ matrix.resource }} and open PR runs-on: ubuntu-latest - container: weaveworks/eksctl-build:4639938e287f84b816c3442206436324730eef46 + container: public.ecr.aws/eksctl/eksctl-build:516ded83aa5dbd3e3c4e25c5d410e2dba3b5e668 env: - UPDATE_BRANCH: update-aws-node GOPRIVATE: "" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0 with: + token: ${{ secrets.EKSCTLBOT_TOKEN }} fetch-depth: 0 + - name: Configure AWS credentials for coredns update + if: ${{ matrix.resource == 'coredns' }} + uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1 + with: + aws-region: us-west-2 + role-duration-seconds: 900 + role-session-name: eksctl-update-coredns-assets + role-to-assume: ${{ secrets.UPDATE_COREDNS_ROLE_ARN }} + - name: Setup identity as eksctl-bot + uses: ./.github/actions/setup-identity + with: + token: "${{ secrets.EKSCTLBOT_TOKEN }}" - name: Cache go-build and mod - uses: actions/cache@v3 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2 with: path: | ~/.cache/go-build/ @@ -29,36 +48,34 @@ jobs: key: go-${{ hashFiles('go.sum') }} restore-keys: | go- - - name: Update aws-node - run: make update-aws-node + - name: Update ${{ matrix.resource }} + run: make update-${{ matrix.resource }} - name: Commit changes id: commit run: | git checkout $DEFAULT_BRANCH - git checkout -B $UPDATE_BRANCH - git config user.name "weaveworksbot" - git config user.email "weaveworksbot@users.noreply.github.com" + git checkout -B update-${{ matrix.resource }} git add -u - if ! EDITOR=true git commit -m "Update aws-node"; then + if ! EDITOR=true git commit -m "Update ${{ matrix.resource }}"; then echo "changes=false" >> $GITHUB_OUTPUT exit 0 fi echo "changes=true" >> $GITHUB_OUTPUT ! git diff --exit-code $DEFAULT_BRANCH HEAD git push --force-with-lease origin HEAD - - uses: actions/github-script@v6.4.1 + - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1 name: Open PR to ${{env.DEFAULT_BRANCH}} - if: ${{ steps.commit.outputs.changes }} == 'true' + if: steps.commit.outputs.changes == 'true' with: - github-token: ${{ secrets.WEAVEWORKSBOT_TOKEN }} + github-token: ${{ secrets.EKSCTLBOT_TOKEN }} script: | - const { data: pr } = await github.pulls.create({ + const { data: pr } = await github.rest.pulls.create({ ...context.repo, - title: "Update aws-node", - head: "${{ env.UPDATE_BRANCH }}", + title: "Update ${{ matrix.resource }}", + head: "update-${{ matrix.resource }}", base: "${{ env.DEFAULT_BRANCH }}", }); - await github.issues.addLabels({ + await github.rest.issues.addLabels({ ...context.repo, issue_number: pr.number, labels: ["kind/improvement"], diff --git a/.gitignore b/.gitignore index 4dbffd6c5a..7dfabf6980 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,7 @@ dist/ # Debug logs logs/* +.DS_Store + +# Ignore social cards cache +userdocs/.cache/* diff --git a/.golangci.yml b/.golangci.yml index bdf0db18e4..13e06ccf62 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ # options for analysis running run: - go: '1.18' + go: '1.20' # default concurrency is a available CPU number concurrency: 4 diff --git a/.goreleaser.brew.yml b/.goreleaser.brew.yml index f2705bbf2e..151965270a 100644 --- a/.goreleaser.brew.yml +++ b/.goreleaser.brew.yml @@ -4,8 +4,8 @@ brews: name: homebrew-tap commit_author: - name: weaveworksbot - email: team+gitbot@weave.works + name: eksctl-bot + email: 53547694+eksctl-bot@users.noreply.github.com folder: Formula @@ -20,7 +20,7 @@ brews: - aws-iam-authenticator custom_block: | - head "https://github.com/weaveworks/eksctl/releases/download/latest_release/eksctl_Darwin_amd64.tar.gz" + head "https://github.com/eksctl-io/eksctl/releases/download/latest_release/eksctl_Darwin_amd64.tar.gz" install: | bin.install "eksctl" diff --git a/.mockery.yaml b/.mockery.yaml new file mode 100644 index 0000000000..d9e1b07099 --- /dev/null +++ b/.mockery.yaml @@ -0,0 +1,38 @@ +mockname: "{{.InterfaceName}}" +structname: "{{.InterfaceName}}.go" +filename: "{{.InterfaceName}}.go" +with-expecter: false +packages: + github.com/weaveworks/eksctl/pkg/awsapi: + config: + all: true + dir: "./pkg/eks/mocksv2" + outpkg: mocksv2 + + github.com/weaveworks/eksctl/pkg/eks: + interfaces: + KubeNodeGroup: + config: + dir: "{{.InterfaceDir}}/mocks" + outpkg: mocks + + github.com/aws/aws-sdk-go-v2/aws: + interfaces: + CredentialsProvider: + config: + dir: "./pkg/eks/mocksv2" + outpkg: mocksv2 + + github.com/aws/aws-sdk-go/aws/client: + interfaces: + ConfigProvider: + config: + dir: "./pkg/eks/mocks" + outpkg: mocks + + github.com/weaveworks/eksctl/pkg/ctl/utils: + interfaces: + VPCConfigUpdater: + config: + dir: "{{.InterfaceDir}}/mocks" + outpkg: mocks diff --git a/.requirements b/.requirements index 99c4ec3723..5a6c9ae4c6 100644 --- a/.requirements +++ b/.requirements @@ -1,10 +1,10 @@ github.com/maxbrunsfeld/counterfeiter/v6 -github.com/cloudflare/cfssl/cmd/cfssl@v1.5.0 -github.com/cloudflare/cfssl/cmd/cfssljson@v1.5.0 +github.com/cloudflare/cfssl/cmd/cfssl@v1.6.4 +github.com/cloudflare/cfssl/cmd/cfssljson@v1.6.4 github.com/golangci/golangci-lint/cmd/golangci-lint github.com/goreleaser/goreleaser -github.com/onsi/ginkgo/v2/ginkgo@v2.1.3 -github.com/vektra/mockery/cmd/mockery +github.com/onsi/ginkgo/v2/ginkgo@v2.12.1 +github.com/vektra/mockery/v2 github.com/github-release/github-release golang.org/x/tools/cmd/stringer k8s.io/code-generator/cmd/client-gen diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index 0e6c5b3314..5ce8f58ba6 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -2,15 +2,15 @@ [//]: # (File generated by gen-attributions. DO NOT EDIT.) -The github.com/weaveworks/eksctl source code is licensed under the +The github.com/eksctl-io/eksctl source code is licensed under the Apache License, version 2.0. A copy of this license is available in the [LICENSE](LICENSE) file in the root source code directory and is included, -along with this document, in any images containing github.com/weaveworks/eksctl +along with this document, in any images containing github.com/eksctl-io/eksctl binaries. ## Package dependencies -The module github.com/weaveworks/eksctl depends on a number of Open Source Go packages. Direct +The module github.com/eksctl-io/eksctl depends on a number of Open Source Go packages. Direct dependencies are listed in the ./go.mod file. Those direct package dependencies have some dependencies of their own (known as "transitive dependencies") @@ -79,9 +79,8 @@ License version 2.0, we include the full text of the package's License below. * `github.com/tidwall/sjson` * `github.com/tj/assert` * `github.com/vburenin/ifacemaker` -* `github.com/vektra/mockery` +* `github.com/vektra/mockery/v2` * `github.com/weaveworks/goformation/v4` -* `github.com/weaveworks/launcher` * `github.com/weaveworks/schemer` * `github.com/xgfone/netaddr` * `golang.org/x/crypto` @@ -16886,7 +16885,7 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -### github.com/vektra/mockery +### github.com/vektra/mockery/v2 Copyright (c) 2014, Opinionated Architecture All rights reserved. diff --git a/COMMUNITY.md b/COMMUNITY.md index 9217232adb..ac49e41ce1 100644 --- a/COMMUNITY.md +++ b/COMMUNITY.md @@ -16,15 +16,14 @@ Ready to start contributing? Head over to our [contribution docs](CONTRIBUTING.m The core team of maintainers are Chetan Patwal ([@cPu1](https://github.com/cPu1)), Tiberiu Copaciu ([@TiberiuGC](https://github.com/TiberiuGC)), -Amine Hilaly ([@A-Hilaly](https://github.com/a-hilaly)), +Amine Hilaly ([@a-hilaly](https://github.com/a-hilaly)), Yu Xiang Zhang ([@yuxiang-zhang](https://github.com/yuxiang-zhang)) and Himangini Daware ([@Himangini](https://github.com/Himangini)). ## Join us! - The project uses Slack. If you get stuck or just have a question then you are encouraged to join the -[Weave Community](https://slack.weave.works/) Slack workspace and use the -[#eksctl](https://weave-community.slack.com/messages/eksctl/) channel. +[Kubernetes Slack](https://slack.k8s.io/) workspace and use the +[#eksctl](https://slack.k8s.io/messages/eksctl/) channel. ## How eksctl is run @@ -41,7 +40,7 @@ We welcome all contributions and user feedback to the project. - End users. In other words the reason why we are all here! - Community contributors. These could be end users themselves, or those working on their open-source game. -- Maintainers. _See [the maintainer docs](https://github.com/weaveworks/eksctl-handbook) for a list +- Maintainers. _See [the maintainer docs](https://github.com/eksctl-io/eksctl-handbook) for a list of maintainer responsibilities._ Decisions are made by Maintainers with input from both Amazon and the community. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d1460dbef..fd838924a0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ clear, we also accept contributions to this contribution doc :smile:. For information on how to get in touch, or how the project is run, please see the [Community page](COMMUNITY.md). -_(If you are a Maintainer, head over to the [Maintainer's guide](https://github.com/weaveworks/eksctl-handbook).)_ +_(If you are a Maintainer, head over to the [Maintainer's guide](https://github.com/eksctl-io/eksctl-handbook).)_ Reading docs is often tedious, so we'll put our most important contributing rule right at the top: **Always be kind!** @@ -77,10 +77,10 @@ Here is a non-exhaustive list of ways you can help out: We have 3 forms of issue: [bug reports](#bug-report-guide), [feature requests](#feature-request-guide) and [help requests](#help-request-guide). If you are not sure which category you need, just make the best guess and provide as much information as possible. -1. Help out others in the [community slack channel](https://weave-community.slack.com/messages/CAYBZBWGL/). :sos: -1. Chime in on [bugs](https://github.com/weaveworks/eksctl/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/weaveworks/eksctl/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Ffeature) and asks for [help](https://github.com/weaveworks/eksctl/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fhelp). :thought_balloon: -1. Dig into some [`needs-investigation` issues](https://github.com/weaveworks/eksctl/labels/needs-investigation) :detective: -1. Get involved in some [PR reviews](https://github.com/weaveworks/eksctl/pulls). :nerd_face: +1. Help out others in the [eksctl slack channel](https://slack.k8s.io/messages/eksctl/). :sos: +1. Chime in on [bugs](https://github.com/eksctl-io/eksctl/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/eksctl-io/eksctl/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Ffeature) and asks for [help](https://github.com/eksctl-io/eksctl/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fhelp). :thought_balloon: +1. Dig into some [`needs-investigation` issues](https://github.com/eksctl-io/eksctl/labels/needs-investigation) :detective: +1. Get involved in some [PR reviews](https://github.com/eksctl-io/eksctl/pulls). :nerd_face: 1. Review old issues; poke or suggest closing ones which are stale or follow up those which still look good. :speech_balloon: 1. Think deeply about the future of `eksctl`, then [talk about it](#proposals). :crystal_ball: @@ -179,7 +179,7 @@ the project goals will likely be rejected, as will highly specialised use-cases. Once you have opened the ticket, feel free to post it in the community -[slack channel](https://weave-community.slack.com/messages/CAYBZBWGL/) to get more opinions on it. +[slack channel](https://slack.k8s.io/messages/eksctl/) to get more opinions on it. Below are the steps we encourage people to take when creating a new feature request: @@ -204,7 +204,7 @@ Below are the steps we encourage people to take when creating a new feature requ ### Help request guide -While you can ask for general help with `eksctl` usage in the [slack channel](https://weave-community.slack.com/messages/CAYBZBWGL/), +While you can ask for general help with `eksctl` usage in the [slack channel](https://slack.k8s.io/messages/eksctl/), opening an issue creates a more searchable history for the community. We hope to respond to requests for help within a couple of working days, but please wait @@ -236,7 +236,7 @@ If you are not here to report a bug, ask for help or request some new behaviour, is the section for you. We have curated a set of issues for anyone who simply wants to build up their open-source cred :muscle:. -- Issues labelled [`good first issue`](https://github.com/weaveworks/eksctl/labels/good%20first%20issue) +- Issues labelled [`good first issue`](https://github.com/eksctl-io/eksctl/labels/good%20first%20issue) should be accessible to folks new to the repo, as well as to open source in general. These issues should present a low/non-existent barrier to entry with a thorough description, @@ -252,7 +252,7 @@ wants to build up their open-source cred :muscle:. See more on [asking for help](#asking-for-help) below! -- [`help wanted` issues](https://github.com/weaveworks/eksctl/labels/help%20wanted) +- [`help wanted` issues](https://github.com/eksctl-io/eksctl/labels/help%20wanted) are for those a little more familiar with the code base, but should still be accessible enough to newcomers. @@ -422,7 +422,7 @@ tests you can get to work :tada: . 1. Write your solution. Try to align with existing patterns and standards. _However_, there is significant tech debt, so any refactoring or changes which would - improve things even a little would be very welcome. (See [#2931](https://github.com/weaveworks/eksctl/issues/2931) + improve things even a little would be very welcome. (See [#2931](https://github.com/eksctl-io/eksctl/issues/2931) for our current efforts.) 1. Try to commit in small chunks so that changes are well described @@ -430,7 +430,7 @@ tests you can get to work :tada: . the future. Make sure commit messages are in the [proper format](#commit-message-formatting). -1. Be sure to include at least unit tests to cover your changes. See the [addon](https://github.com/weaveworks/eksctl/blob/main/pkg/actions/addon) +1. Be sure to include at least unit tests to cover your changes. See the [addon](https://github.com/eksctl-io/eksctl/blob/main/pkg/actions/addon) package for a good example of tests. > NOTE: We are trying to move away from using [`mockery`](https://github.com/vektra/mockery) @@ -468,11 +468,11 @@ If you need help at any stage of your work, please don't hesitate to ask! - If you are struggling with something while working on your PR, or aren't quite sure of your approach, you can open a [draft](https://github.blog/2019-02-14-introducing-draft-pull-requests/) (prefix the title with `WIP:`) and explain what you are thinking. - You can tag in one of the core team, or drop the PR link into [slack](https://weave-community.slack.com/messages/eksctl/) and get + You can tag in one of the core team, or drop the PR link into [slack](https://slack.k8s.io/messages/eksctl/) and get help from the community. - We are happy to pair with contributors over a slack call to help them fine-tune their - implementation. You can ping us directly, or head to the [channel](https://weave-community.slack.com/messages/eksctl/) + implementation. You can ping us directly, or head to the [channel](https://slack.k8s.io/messages/eksctl/) to see if anyone in the community is up for being a buddy :smiley: . ### PR submission guidelines @@ -591,7 +591,7 @@ The core team regularly processes incoming issues. There may be some delay over Every issue will be assigned a `priority/` label. The levels of priorities are: -- [`critical`](https://github.com/weaveworks/eksctl/labels/priority%2Fcritical): These are time sensitive issues which should be picked up immediately. +- [`critical`](https://github.com/eksctl-io/eksctl/labels/priority%2Fcritical): These are time sensitive issues which should be picked up immediately. If an issue labelled `critical` is not assigned or being actively worked on, someone is expected to drop what they're doing immediately to work on it. This usually means the core team, but community members are welcome to claim @@ -600,18 +600,18 @@ Every issue will be assigned a `priority/` label. The levels of priorities ar they will be paired with a core team-member to manage the tracking, communication and release of any fix as well as to assume responsibility of all progess._ -- [`important-soon`](https://github.com/weaveworks/eksctl/labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available. +- [`important-soon`](https://github.com/eksctl-io/eksctl/labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available. Ideally something should be delivered in time for the next release. -- [`important-longterm`](https://github.com/weaveworks/eksctl/labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently +- [`important-longterm`](https://github.com/eksctl-io/eksctl/labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently staffed and/or may require multiple releases to complete. -- [`backlog`](https://github.com/weaveworks/eksctl/labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have, +- [`backlog`](https://github.com/eksctl-io/eksctl/labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have, but we may not have anyone available to work on it right now or in the immediate future. PRs are still very welcome, although it might take a while to get them reviewed if reviewers are fully occupied with higher priority issues, for example immediately before a release. -- [`needs-investigation`](https://github.com/weaveworks/eksctl/labels/needs-investigation): There is currently insufficient information to either categorize properly, +- [`needs-investigation`](https://github.com/eksctl-io/eksctl/labels/needs-investigation): There is currently insufficient information to either categorize properly, or to understand and implement a solution. This could be because the issue opener did not provide enough relevant information, or because more in-depth research is required before work can begin. @@ -698,4 +698,4 @@ Each proposal/design doc should cover the following _at a minimum_: --- -## :rocket: :tada: Thanks for reading! :tada: :rocket +## :rocket: :tada: Thanks for reading! :tada: :rocket: diff --git a/Dockerfile b/Dockerfile index e1cd956fa7..4016af954b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=weaveworks/eksctl-build:4639938e287f84b816c3442206436324730eef46 +ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:516ded83aa5dbd3e3c4e25c5d410e2dba3b5e668 FROM $BUILD_IMAGE as build WORKDIR /src diff --git a/LICENSE b/LICENSE index 9cd1640bad..4f5181b43f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,6 @@ -Copyright 2018 Weaveworks. All rights reserved. +Copyright 2018 Weaveworks. +Copyright 2023 The eksctl Authors. +All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index 086ffd295e..659911ab4d 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ gocache := $(shell go env GOCACHE) export GOBIN ?= $(gopath)/bin AWS_SDK_GO_DIR ?= $(shell go list -m -f '{{.Dir}}' 'github.com/aws/aws-sdk-go') +AWS_SDK_V2_GO_DIR ?= $(shell go list -m -f '{{.Dir}}' 'github.com/aws/aws-sdk-go-v2') generated_code_deep_copy_helper := pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go @@ -91,7 +92,10 @@ test: ## Lint, generate and run unit tests. Also ensure that integration tests c $(MAKE) build-integration-test .PHONY: unit-test -unit-test: check-all-generated-files-up-to-date ## Run unit test only +unit-test: check-all-generated-files-up-to-date unit-test-no-generate + +.PHONY: unit-test-no-generate ## Run unit test only +unit-test-no-generate: CGO_ENABLED=0 go test -tags=release ./pkg/... ./cmd/... $(UNIT_TEST_ARGS) .PHONY: unit-test-race @@ -143,7 +147,7 @@ generate-always: pkg/addons/default/assets/aws-node.yaml ## Generate code (requi go generate ./pkg/authconfigmap go generate ./pkg/awsapi/... go generate ./pkg/eks - go generate ./pkg/eks/mocksv2 + ${GOBIN}/mockery go generate ./pkg/drain go generate ./pkg/actions/... go generate ./pkg/executor @@ -165,6 +169,10 @@ pkg/addons/default/assets/aws-node.yaml: update-aws-node: ## Re-download the aws-node manifests from AWS go generate ./pkg/addons/default/aws_node_generate.go +.PHONY: +update-coredns: ## get latest coredns builds for each available eks version + @go run pkg/addons/default/scripts/update_coredns_assets.go + deep_copy_helper_input = $(shell $(call godeps_cmd,./pkg/apis/...) | sed 's|$(generated_code_deep_copy_helper)||' ) $(generated_code_deep_copy_helper): $(deep_copy_helper_input) ## Generate Kubernetes API helpers build/scripts/update-codegen.sh @@ -172,6 +180,7 @@ $(generated_code_deep_copy_helper): $(deep_copy_helper_input) ## Generate Kuber $(generated_code_aws_sdk_mocks): $(call godeps,pkg/eks/mocks/mocks.go) ## Generate AWS SDK mocks AWS_SDK_GO_DIR=$(AWS_SDK_GO_DIR) go generate ./pkg/eks/mocks + .PHONY: generate-kube-reserved generate-kube-reserved: ## Update instance list with respective specs @cd ./pkg/nodebootstrap/ && go run reserved_generate.go diff --git a/Makefile.docker b/Makefile.docker index a428710988..1a8a501c02 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -5,17 +5,17 @@ export PATH := ./build/scripts:$(PATH) image_manifest_file = build/docker/build_image_manifest # We use git object hashes for determining the input files used for any given build image -# E.g. given `weaveworks/eksctl-build:e6e8800773d3adf8e7999a23dcdb07414c66a4da` one can -# run `git show e6e8800773d3adf8e7999a23dcdb07414c66a4da` to get contents of `.build_image_manifest`, +# E.g. given `public.ecr.aws/eksctl/eksctl-build:d94225a6dbb6dfab6dd185442ae554432f9365dc` one can +# run `git show d94225a6dbb6dfab6dd185442ae554432f9365dc` to get contents of `.build_image_manifest`, # and `git show ` for each of the hashes in the manifest to determine contents of each of the # files used in `$(build_image_input)` at the time. build_image_tag_file = build/docker/image_tag build_image_tag = $(shell cat $(build_image_tag_file)) -build_image = weaveworks/eksctl-build +build_image = public.ecr.aws/eksctl/eksctl-build build_image_name = $(build_image):$(build_image_tag) -eksctl_image = weaveworks/eksctl +eksctl_image = public.ecr.aws/eksctl/eksctl eksctl_image_name = "$(eksctl_image):$${EKSCTL_IMAGE_VERSION}" docker_build := time docker build @@ -29,6 +29,9 @@ sedi = -i '' endif ##@ Docker +.PHONY: authenticate-ecr-for-docker +authenticate-ecr-for-docker: ## Get ECR public registry credentials with AWS credentials + aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws .PHONY: update-build-image-tag update-build-image-tag: ## Update the build image tag as referenced across the repo @@ -46,6 +49,7 @@ check-build-image-manifest-up-to-date: update-build-image-tag ## Update build im commit-new-image-tag: ## Update build image manifest and commits the changes git add -u git commit --message 'Update build image manifest, tag file and workflows' + @echo "Remember to run \"Publish ECR eksctl-build image\" GitHub workflow after merging these image tag changes" .PHONY: build-image build-image: check-build-image-manifest-up-to-date ## Build the build image that has all of external dependencies @@ -57,9 +61,9 @@ build-image: check-build-image-manifest-up-to-date ## Build the build image that build/docker/ .PHONY: push-build-image -push-build-image: build-image ## Push the build image to the Docker Hub registry +push-build-image: authenticate-ecr-for-docker build-image ## Push the build image to the ECR public registry docker push $(build_image_name) - echo "Remember to commit the image_tag and build_image_manifest files" + @echo "Remember to commit the image_tag and build_image_manifest files" .PHONY: eksctl-image eksctl-image: ## Build the eksctl image that has release artefacts and no build dependencies @@ -71,7 +75,7 @@ eksctl-image: ## Build the eksctl image that has release artefacts and no build $(git_toplevel) .PHONY: eksctl-image -push-eksctl-image: eksctl-image ## Push the eksctl image to the Docker Hub registry +push-eksctl-image: eksctl-image ## Push the eksctl image to the ECR public registry docker push $(eksctl_image_name) .PHONY: build-test diff --git a/Makefile.docs b/Makefile.docs index ca5eeebbe0..8d2b08fd14 100644 --- a/Makefile.docs +++ b/Makefile.docs @@ -7,6 +7,7 @@ userdocs/src/usage/schema.json: pkg/apis/eksctl.io/v1alpha5/assets/schema.json .PHONY: install-site-deps install-site-deps: ## Install dependencies for user docs pip3 install -r userdocs/requirements.txt + sudo apt-get install libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev pngquant .PHONY: serve-pages serve-pages: ## Serve the site locally diff --git a/README.md b/README.md index 130680de2e..9d2296d4af 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# `eksctl` - The official CLI for Amazon EKS +# `eksctl` - The official CLI for Amazon EKS ! eksctl -[![Go Report Card](https://goreportcard.com/badge/github.com/weaveworks/eksctl)](https://goreportcard.com/report/github.com/weaveworks/eksctl) +[![Go Report Card](https://goreportcard.com/badge/github.com/eksctl-io/eksctl)](https://goreportcard.com/report/github.com/eksctl-io/eksctl) `eksctl` is a simple CLI tool for creating clusters on EKS - Amazon's new managed Kubernetes service for EC2. It is written in Go, and uses CloudFormation. @@ -8,12 +8,35 @@ You can create a cluster in minutes with just one command – **`eksctl create c ![Gophers: E, K, S, C, T, & L](logo/eksctl.png) -_Need help? Join [Weave Community Slack][slackjoin]._ +_Need help? Join [Eksctl Slack][slackjoin]._ ## Installation `eksctl` is available to install from official releases as described below. We recommend that you install `eksctl` from only the official GitHub releases. You may opt to use a third-party installer, but please be advised that AWS does not maintain nor support these methods of installation. Use them at your own discretion. +### Prerequisite + +You will need to have AWS API credentials configured. What works for AWS CLI or any other tools (kops, Terraform, etc.) should be sufficient. You can use [`~/.aws/credentials` file][awsconfig] +or [environment variables][awsenv]. For more information read [AWS documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html). + +[awsenv]: https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html +[awsconfig]: https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html + +You will also need [AWS IAM Authenticator for Kubernetes](https://github.com/kubernetes-sigs/aws-iam-authenticator) command (either `aws-iam-authenticator` or `aws eks get-token` (available in version 1.16.156 or greater of AWS CLI) in your `PATH`. + +The IAM account used for EKS cluster creation should have these minimal access levels. + +| AWS Service | Access Level | +|------------------|--------------------------------------------------------| +| CloudFormation | Full Access | +| EC2 | **Full:** Tagging **Limited:** List, Read, Write | +| EC2 Auto Scaling | **Limited:** List, Write | +| EKS | Full Access | +| IAM | **Limited:** List, Read, Write, Permissions Management | +| Systems Manager | **Limited:** List, Read | + +The inline policy json is listed in [Minimal IAM Policies](https://eksctl.io/usage/minimum-iam-policies/). + ### For Unix To download the latest release, run: @@ -23,10 +46,10 @@ To download the latest release, run: ARCH=amd64 PLATFORM=$(uname -s)_$ARCH -curl -sLO "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$PLATFORM.tar.gz" +curl -sLO "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_$PLATFORM.tar.gz" # (Optional) Verify checksum -curl -sL "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check +curl -sL "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check tar -xzf eksctl_$PLATFORM.tar.gz -C /tmp && rm eksctl_$PLATFORM.tar.gz @@ -35,13 +58,13 @@ sudo mv /tmp/eksctl /usr/local/bin ### For Windows -#### Direct download (latest release): [AMD64/x86_64](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_amd64.zip) - [ARMv6](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_armv6.zip) - [ARMv7](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_armv7.zip) - [ARM64](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_arm64.zip) +#### Direct download (latest release): [AMD64/x86_64](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_amd64.zip) - [ARMv6](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_armv6.zip) - [ARMv7](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_armv7.zip) - [ARM64](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_arm64.zip) Make sure to unzip the archive to a folder in the `PATH` variable. Optionally, verify the checksum: -1. Download the checksum file: [latest](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_checksums.txt) +1. Download the checksum file: [latest](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt) 2. Use Command Prompt to manually compare `CertUtil`'s output to the checksum file downloaded. ```cmd @@ -63,10 +86,10 @@ Optionally, verify the checksum: ARCH=amd64 PLATFORM=windows_$ARCH -curl -sLO "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$PLATFORM.zip" +curl -sLO "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_$PLATFORM.zip" # (Optional) Verify checksum -curl -sL "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check +curl -sL "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check unzip eksctl_$PLATFORM.zip -d $HOME/bin @@ -77,7 +100,11 @@ The `eksctl` executable is placed in `$HOME/bin`, which is in `$PATH` from Git B ### Docker -For every release and RC, a docker image is pushed to [weaveworks/eksctl - Docker Image | Docker Hub](https://hub.docker.com/r/weaveworks/eksctl). +For every release and RC a container image is pushed to ECR repository `public.ecr.aws/eksctl/eksctl`. Learn more about the usage on [ECR Public Gallery - eksctl](https://gallery.ecr.aws/eksctl/eksctl). For example, + +```bash +docker run --rm -it public.ecr.aws/eksctl/eksctl version +``` ### Third-Party Installers (Not Recommended) @@ -101,7 +128,7 @@ port install eksctl [chocolatey](https://chocolatey.org) ```bash -chocolatey install eksctl +choco install eksctl ``` [scoop](https://scoop.sh) @@ -110,29 +137,6 @@ chocolatey install eksctl scoop install eksctl ``` -## Prerequisite - -You will need to have AWS API credentials configured. What works for AWS CLI or any other tools (kops, Terraform, etc.) should be sufficient. You can use [`~/.aws/credentials` file][awsconfig] -or [environment variables][awsenv]. For more information read [AWS documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html). - -[awsenv]: https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html -[awsconfig]: https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html - -You will also need [AWS IAM Authenticator for Kubernetes](https://github.com/kubernetes-sigs/aws-iam-authenticator) command (either `aws-iam-authenticator` or `aws eks get-token` (available in version 1.16.156 or greater of AWS CLI) in your `PATH`. - -The IAM account used for EKS cluster creation should have these minimal access levels. - -| AWS Service | Access Level | -|------------------|--------------------------------------------------------| -| CloudFormation | Full Access | -| EC2 | **Full:** Tagging **Limited:** List, Read, Write | -| EC2 Auto Scaling | **Limited:** List, Write | -| EKS | Full Access | -| IAM | **Limited:** List, Read, Write, Permissions Management | -| Systems Manager | **Limited:** List, Read | - -The inline policy json is listed in [Minimal IAM Policies](https://eksctl.io/usage/minimum-iam-policies/). - ## Basic usage To create a basic cluster, run: @@ -208,7 +212,6 @@ To learn more about what `eksctl` can do check [eksctl.io](https://eksctl.io). A ## Contributions Code contributions are very welcome. If you are interested in helping make `eksctl` great then see our [contributing guide](CONTRIBUTING.md). -Or join the discussion on our [mailing list][maillist]. We follow the [CNCF Code of Conduct](CODE_OF_CONDUCT.md). @@ -227,11 +230,10 @@ Do not open security related issues in the open source project. ## Get in touch -[Create an issue](https://github.com/weaveworks/eksctl/issues/new), or login to [Weave Community Slack (#eksctl)][slackchan] ([signup][slackjoin]). +[Create an issue](https://github.com/eksctl-io/eksctl/issues/new), or login to [Eksctl Community Slack (#eksctl)][slackchan] ([signup][slackjoin]). -[slackjoin]: https://slack.weave.works/ -[slackchan]: https://weave-community.slack.com/messages/eksctl/ -[maillist]: https://groups.google.com/forum/#!forum/eksctl +[slackjoin]: https://slack.k8s.io/ +[slackchan]: https://slack.k8s.io/messages/eksctl/ > **_Logo Credits_** > diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 622b8f678d..80fe0de3da 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -1,7 +1,7 @@ # Make sure to run the following commands after changes to this file are made: # `make -f Makefile.docker update-build-image-tag && make -f Makefile.docker push-build-image` -FROM golang:1.18.8-alpine3.16@sha256:6b494c932ee8c209631e27521ddbe364da56e7f1275998fbb182447d20103e46 AS base +FROM golang:1.20.8-alpine3.18@sha256:90246ec31bcf460ff3dbe8a4a63e8997bc36781a2eba9e0419e9b53e0bd36a0d AS base # Add kubectl and aws-iam-authenticator to the PATH ENV PATH="${PATH}:/out/usr/bin:/out/usr/local/bin" @@ -20,6 +20,7 @@ RUN apk add --no-cache \ musl-dev \ jq \ py3-setuptools \ + tar \ && true # Runtime dependencies. Build the root filesystem of the eksctl image at /out diff --git a/build/docker/build_image_manifest b/build/docker/build_image_manifest index 4639938e28..516ded83aa 100644 --- a/build/docker/build_image_manifest +++ b/build/docker/build_image_manifest @@ -1,19 +1,19 @@ -"github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1" -"github.com/cloudflare/cfssl v1.6.3" -"github.com/cloudflare/cfssl v1.6.3" -"github.com/golangci/golangci-lint v1.50.1" +"github.com/maxbrunsfeld/counterfeiter/v6 v6.6.2" +"github.com/cloudflare/cfssl v1.6.4" +"github.com/cloudflare/cfssl v1.6.4" +"github.com/golangci/golangci-lint v1.54.2" "github.com/goreleaser/goreleaser v1.11.5" -"github.com/onsi/ginkgo/v2 v2.10.0" -"github.com/vektra/mockery v1.1.2" +"github.com/onsi/ginkgo/v2 v2.12.1" +"github.com/vektra/mockery/v2 v2.35.3" "github.com/github-release/github-release v0.10.0" -"golang.org/x/tools v0.9.3" -"k8s.io/code-generator v0.25.0" -"k8s.io/code-generator v0.25.0" -"k8s.io/code-generator v0.25.0" -"k8s.io/code-generator v0.25.0" -"k8s.io/code-generator v0.25.0" +"golang.org/x/tools v0.14.0" +"k8s.io/code-generator v0.25.11" +"k8s.io/code-generator v0.25.11" +"k8s.io/code-generator v0.25.11" +"k8s.io/code-generator v0.25.11" +"k8s.io/code-generator v0.25.11" "sigs.k8s.io/mdtoc v1.1.0" "github.com/vburenin/ifacemaker v1.2.1" -100644 blob 622b8f678db0e0baa19653e0544abd7d20832ce5 build/docker/Dockerfile -100644 blob 99c4ec37235d07d497278b84439afe571c651441 .requirements +100644 blob 80fe0de3dabc122dacbf9fd528653fab7c25af4b build/docker/Dockerfile +100644 blob 5a6c9ae4c6009fa13d955867f2ff8706038d7110 .requirements 100755 blob c1129ff1ff85ac2c53f908a577675ea59a9325a7 build/scripts/install-build-deps.sh diff --git a/build/docker/image_tag b/build/docker/image_tag index 9618c6d070..ff11e1dfb2 100644 --- a/build/docker/image_tag +++ b/build/docker/image_tag @@ -1 +1 @@ -4639938e287f84b816c3442206436324730eef46 +516ded83aa5dbd3e3c4e25c5d410e2dba3b5e668 diff --git a/build/scripts/tag-common.sh b/build/scripts/tag-common.sh index 1b366d5c4d..134632f8bd 100755 --- a/build/scripts/tag-common.sh +++ b/build/scripts/tag-common.sh @@ -24,7 +24,7 @@ function release_generate() { } function check_origin() { - if [[ ! "$(git remote get-url origin)" =~ weaveworks/eksctl(\-private)?(\.git)?$ ]] ; then + if [[ ! "$(git remote get-url origin)" =~ eksctl\-io/eksctl(\-private)?(\.git)?$ ]] ; then echo "Invalid origin: $(git remote get-url origin)" exit 3 fi diff --git a/docs/contributor-meetings.md b/docs/contributor-meetings.md index be0fc1ed4f..e653d0cd1b 100644 --- a/docs/contributor-meetings.md +++ b/docs/contributor-meetings.md @@ -64,7 +64,7 @@ Topics: - progress update on `kubectl drain` refactoring - [k/k#72827](https://github.com/kubernetes/kubernetes/pull/72827) merged - `eksctl utils describe-stacks` - additon of `--trail` - - call for help on improving output [#585](https://github.com/weaveworks/eksctl/issues/585) + - call for help on improving output [#585](https://github.com/eksctl-io/eksctl/issues/585) ### 06/03/2019 @@ -73,7 +73,7 @@ Attendees: - @mumoshu Topics: -- upgrades - [#608](https://github.com/weaveworks/eksctl/issues/608) +- upgrades - [#608](https://github.com/eksctl-io/eksctl/issues/608) ### 13/03/2019 @@ -82,9 +82,9 @@ Attendees: - @mumoshu Topics: -- upgrades - [#608](https://github.com/weaveworks/eksctl/issues/608) +- upgrades - [#608](https://github.com/eksctl-io/eksctl/issues/608) - `k8s.io/client-go` & co - - `RawClient` and `RawResource` - [#624](https://github.com/weaveworks/eksctl/pull/624) + - `RawClient` and `RawResource` - [#624](https://github.com/eksctl-io/eksctl/pull/624) - update on challenges with going to production from @mumoshu - node-local DNS and chaching - gitops with helmfile - need better way to manage `aws-auth` @@ -98,7 +98,7 @@ Attendees: Topics: - release updates - 0.1.24 - plan towards v1alpha5 -- more discussion around storing config objects [#642](https://github.com/weaveworks/eksctl/issues/642) +- more discussion around storing config objects [#642](https://github.com/eksctl-io/eksctl/issues/642) ### 27/03/2019 @@ -110,7 +110,7 @@ Attendees: Topics: - update on latest features that made it to the release - v1alpha5 -- nodegroup deletion [#664](https://github.com/weaveworks/eksctl/issues/664) +- nodegroup deletion [#664](https://github.com/eksctl-io/eksctl/issues/664) ## 03/04/2019 diff --git a/docs/current-001-node_bootstrap.md b/docs/current-001-node_bootstrap.md index 9166968643..00bde8d67e 100644 --- a/docs/current-001-node_bootstrap.md +++ b/docs/current-001-node_bootstrap.md @@ -57,7 +57,7 @@ for any other purpose. ## Current Design Summary: -- all configuration files along with [the bootstrap script](https://github.com/weaveworks/eksctl/blob/70041a226bb8ef5c51a229d587235551a2410eda/pkg/nodebootstrap/assets/bootstrap.al2.sh) are passed to the node as cloud-init config +- all configuration files along with [the bootstrap script](https://github.com/eksctl-io/eksctl/blob/70041a226bb8ef5c51a229d587235551a2410eda/pkg/nodebootstrap/assets/bootstrap.al2.sh) are passed to the node as cloud-init config - all configuration files are written to `/etc/eksctl` directory - the only remote API that's used is the EC2 metadata service, required to obtain instance ID, type and IP address - the behavior is fully determined by: @@ -85,7 +85,7 @@ The main files are the [bootstrap script](#bootstrap-script-for-amazon-linux-2), [kubelet.yaml](#kubelet-configuration) and the [kubeconfig.yalm](#kubeconfig). -### [Bootstrap Script for Amazon Linux 2](https://github.com/weaveworks/eksctl/blob/master/pkg/nodebootstrap/assets/bootstrap.al2.sh) +### [Bootstrap Script for Amazon Linux 2](https://github.com/eksctl-io/eksctl/blob/master/pkg/nodebootstrap/assets/bootstrap.al2.sh) This is sent as one of the `runScript`s in the `userData` and it is used to bootstrap the node. It can also be [overwritten](/usage/schema/#nodeGroups-overrideBootstrapCommand) by the user or appended with @@ -142,11 +142,11 @@ systemctl start kubelet -### [Bootstrap Script for Ubuntu](https://github.com/weaveworks/eksctl/blob/master/pkg/nodebootstrap/assets/bootstrap.ubuntu.sh) +### [Bootstrap Script for Ubuntu](https://github.com/eksctl-io/eksctl/blob/master/pkg/nodebootstrap/assets/bootstrap.ubuntu.sh) Same as above, but Ubuntu-specific commands are used instead of `systemctl` and the drop-in unit. -### [Systemd Unit for Amazon Linux](https://github.com/weaveworks/eksctl/blob/70041a226bb8ef5c51a229d587235551a2410eda/pkg/nodebootstrap/assets/10-eksclt.al2.conf) +### [Systemd Unit for Amazon Linux](https://github.com/eksctl-io/eksctl/blob/70041a226bb8ef5c51a229d587235551a2410eda/pkg/nodebootstrap/assets/10-eksclt.al2.conf) This is the systemd unit file used to start the kubelet service. It makes use of other configuration files sent by eksctl and it is stored in `etc/systemd/system/kubelet.service.d/10-eksctl.al2.conf`. @@ -177,7 +177,7 @@ ExecStart=/usr/bin/kubelet \ -### [Kubelet configuration](https://github.com/weaveworks/eksctl/blob/70041a226bb8ef5c51a229d587235551a2410eda/pkg/nodebootstrap/assets/kubelet.yaml) +### [Kubelet configuration](https://github.com/eksctl-io/eksctl/blob/70041a226bb8ef5c51a229d587235551a2410eda/pkg/nodebootstrap/assets/kubelet.yaml) The configuration for the kubelet is stored in `/etc/eksctl/kubelet.yaml`. diff --git a/docs/proposal-000-template.md b/docs/proposal-000-template.md index 84479a3bcf..fa38daddf3 100644 --- a/docs/proposal-000-template.md +++ b/docs/proposal-000-template.md @@ -7,7 +7,7 @@ How to use this template: - Open a PR to eksctl - Merge early and iterate -For more tips see the Contributing docs: https://github.com/weaveworks/eksctl/blob/master/CONTRIBUTING.md#proposals +For more tips see the Contributing docs: https://github.com/eksctl-io/eksctl/blob/master/CONTRIBUTING.md#proposals --> # Short, descriptive title diff --git a/docs/proposal-002_existing-vpc.md b/docs/proposal-002_existing-vpc.md index 1b00236191..3118a4d5d3 100644 --- a/docs/proposal-002_existing-vpc.md +++ b/docs/proposal-002_existing-vpc.md @@ -11,11 +11,11 @@ Since then, many users asked for various features in relation to custom VPC. There a few specific use-cases: -1. co-location with kops [#50](https://github.com/weaveworks/eksctl/issues/50) -2. set custom CIDR [#279](https://github.com/weaveworks/eksctl/issues/279) -3. private/public subnets [#120](https://github.com/weaveworks/eksctl/issues/120) -4. use any existing VPC [#42](https://github.com/weaveworks/eksctl/issues/42) -5. use same subnet/AZ for a nodegroup [#232](https://github.com/weaveworks/eksctl/issues/232) +1. co-location with kops [#50](https://github.com/eksctl-io/eksctl/issues/50) +2. set custom CIDR [#279](https://github.com/eksctl-io/eksctl/issues/279) +3. private/public subnets [#120](https://github.com/eksctl-io/eksctl/issues/120) +4. use any existing VPC [#42](https://github.com/eksctl-io/eksctl/issues/42) +5. use same subnet/AZ for a nodegroup [#232](https://github.com/eksctl-io/eksctl/issues/232) Out of the above, we already have support for 1 & 2 (as of 0.1.8) as well as 3 (as of 0.1.9). diff --git a/docs/proposal-003-extending-use-of-config-file.md b/docs/proposal-003-extending-use-of-config-file.md index 269251d535..58dbfbb090 100644 --- a/docs/proposal-003-extending-use-of-config-file.md +++ b/docs/proposal-003-extending-use-of-config-file.md @@ -82,7 +82,7 @@ eksctl create ng --config-file=cluster.yaml --include=ng1-public ## only one no eksctl create ng --config-file=cluster.yaml --include=ng1-public,ng2-private ## both nodegroups will be created ``` -The `eksctl create cluster` cli will be updated to optionally ignore all nodegroups in the cluster config. https://github.com/weaveworks/eksctl/issues/555 +The `eksctl create cluster` cli will be updated to optionally ignore all nodegroups in the cluster config. https://github.com/eksctl-io/eksctl/issues/555 By using a single configuration file, users can keep their cluster definitions together and most importantly checked into source control. diff --git a/docs/proposal-006-build-improvements.md b/docs/proposal-006-build-improvements.md index 301a7c9d8f..a86b95ff9b 100644 --- a/docs/proposal-006-build-improvements.md +++ b/docs/proposal-006-build-improvements.md @@ -10,7 +10,7 @@ The original solution involved: Publishing build and final images hasn't been automated, but some users requested it. -When we switched [to modules](https://github.com/weaveworks/eksctl/pull/917), we have increased the +When we switched [to modules](https://github.com/eksctl-io/eksctl/pull/917), we have increased the compexity of how build image worked. It's hard for a new person to understand it, e.g. for a new contributor. @@ -54,7 +54,7 @@ and can be reproduced any other CI environment. ### Details -This proposal [#1200](https://github.com/weaveworks/eksctl/pull/1200) aims to streamline the following +This proposal [#1200](https://github.com/eksctl-io/eksctl/pull/1200) aims to streamline the following aspects: - automate build image versioning through deterministic git object hashes (see `Makefile.docker`) @@ -106,17 +106,17 @@ Overall, there is a definite 2m speed-up. ## Simplifications -We currently have rather complicated [CircleCI config](https://github.com/weaveworks/eksctl/blob/950f9bc695234107725234b9e1a9c9d2ee54e51f/.circleci/config.yml#L3-L38), -and [`Makefile`](https://github.com/weaveworks/eksctl/blob/950f9bc695234107725234b9e1a9c9d2ee54e51f/Makefile#L188-L204). +We currently have rather complicated [CircleCI config](https://github.com/eksctl-io/eksctl/blob/950f9bc695234107725234b9e1a9c9d2ee54e51f/.circleci/config.yml#L3-L38), +and [`Makefile`](https://github.com/eksctl-io/eksctl/blob/950f9bc695234107725234b9e1a9c9d2ee54e51f/Makefile#L188-L204). -New configuration is much simpler, in [CircleCI config](https://github.com/weaveworks/eksctl/blob/d3b6988562b14c9d91f4e1bf7dd2c086e06c2383/.circleci/config.yml#L3-L24) -it comes down to running [`make test`](https://github.com/weaveworks/eksctl/blob/1be26b314333467d1b67a44c77d1cd27460eaa70/Makefile#L68-L73) followed by `make build`. +New configuration is much simpler, in [CircleCI config](https://github.com/eksctl-io/eksctl/blob/d3b6988562b14c9d91f4e1bf7dd2c086e06c2383/.circleci/config.yml#L3-L24) +it comes down to running [`make test`](https://github.com/eksctl-io/eksctl/blob/1be26b314333467d1b67a44c77d1cd27460eaa70/Makefile#L68-L73) followed by `make build`. ## Further Improvements - [x] stop using `docker run` and `docker commit`, use another `Dockerfile` instead of `eksctl-image-builder.sh` - [x] push images to a registry (GitHub offering could be a good fit, otherwise consider ECR) -- [ ] automate other workflows with bots and GitHub Actions (e.g. cherry-picking [#1284](https://github.com/weaveworks/eksctl/issues/1284), AMI updates [#314](https://github.com/weaveworks/eksctl/issues/314)) +- [ ] automate other workflows with bots and GitHub Actions (e.g. cherry-picking [#1284](https://github.com/eksctl-io/eksctl/issues/1284), AMI updates [#314](https://github.com/eksctl-io/eksctl/issues/314)) - [x] automate integration tests - [ ] allow running integration tests on PRs from contributors upon PR approval diff --git a/docs/proposal-007-apply.md b/docs/proposal-007-apply.md index dfd22d966b..6631ebd170 100644 --- a/docs/proposal-007-apply.md +++ b/docs/proposal-007-apply.md @@ -152,7 +152,7 @@ delete any not listed in the config. ##### `terraform`-style state Storing some kind of state/config "somewhere" is another option and has been discussed in -https://github.com/weaveworks/eksctl/issues/642 +https://github.com/eksctl-io/eksctl/issues/642  #### Ignore resource option diff --git a/docs/proposal-008-flux2.md b/docs/proposal-008-flux2.md index a140f0c75a..487b6dfdb3 100644 --- a/docs/proposal-008-flux2.md +++ b/docs/proposal-008-flux2.md @@ -100,10 +100,10 @@ The unofficial motivations of this proposal are: ### Linked Docs -[Original PR](https://github.com/weaveworks/eksctl/pull/3066). +[Original PR](https://github.com/eksctl-io/eksctl/pull/3066). [Current eksctl docs](https://eksctl.io/usage/gitops/#experimental-installing-flux-v2-gitops-toolkit). -[Current Flux api object in eksctl](https://github.com/weaveworks/eksctl/blob/ab702daa671a87dc926b70348481ce336638f064/pkg/apis/eksctl.io/v1alpha5/types.go#L901-L937). -[Expansion issue](https://github.com/weaveworks/eksctl/issues/3238). +[Current Flux api object in eksctl](https://github.com/eksctl-io/eksctl/blob/ab702daa671a87dc926b70348481ce336638f064/pkg/apis/eksctl.io/v1alpha5/types.go#L901-L937). +[Expansion issue](https://github.com/eksctl-io/eksctl/issues/3238). ## Details diff --git a/docs/release_notes/0.1.38.md b/docs/release_notes/0.1.38.md index dbeb712b17..e499889a33 100644 --- a/docs/release_notes/0.1.38.md +++ b/docs/release_notes/0.1.38.md @@ -1,5 +1,5 @@ # Release 0.1.38 ## Improvements -- Support [extra parameters in kubelet configuration](https://github.com/weaveworks/eksctl/blob/master/userdocs/src/usage/customizing-the-kubelet.md) (#795) +- Support [extra parameters in kubelet configuration](https://github.com/eksctl-io/eksctl/blob/master/userdocs/src/usage/customizing-the-kubelet.md) (#795) - Include cluster name and region in output when using a config file (#912) diff --git a/docs/release_notes/0.1.39.md b/docs/release_notes/0.1.39.md index 3cce7b475d..f92a14d03c 100644 --- a/docs/release_notes/0.1.39.md +++ b/docs/release_notes/0.1.39.md @@ -5,8 +5,8 @@ - New [website](https://eksctl.io) design - Documentation reworked and restructured - Kubernetes 1.13 is now default for new clusters [#971] -- New modes for NAT Gateway topology (see [`examples/09-nat-gateways.yaml`](https://github.com/weaveworks/eksctl/blob/master/examples/09-nat-gateways.yaml)) [#694, #392] -- More options for EBS root volume encryption (see [`examples/10-encrypted-volumes.yaml`](https://github.com/weaveworks/eksctl/blob/master/examples/10-encrypted-volumes.yaml) [#952] +- New modes for NAT Gateway topology (see [`examples/09-nat-gateways.yaml`](https://github.com/eksctl-io/eksctl/blob/master/examples/09-nat-gateways.yaml)) [#694, #392] +- More options for EBS root volume encryption (see [`examples/10-encrypted-volumes.yaml`](https://github.com/eksctl-io/eksctl/blob/master/examples/10-encrypted-volumes.yaml) [#952] - Use latest AMIs [#934, #982] ## Bug fixes and code quality improvements diff --git a/docs/release_notes/0.146.0.md b/docs/release_notes/0.146.0.md new file mode 100644 index 0000000000..63dd0b8dd8 --- /dev/null +++ b/docs/release_notes/0.146.0.md @@ -0,0 +1,18 @@ +# Release v0.146.0 + +## 🎯 Improvements + +- Update vpc-cni to 1.12.6 (#6692) + +## 🧰 Maintenance + +- Bump dependencies (#6690) + +## 📝 Documentation + +- New eksctl channel (#6697) + +## Acknowledgments + +Weaveworks would like to sincerely thank: +@wind0r diff --git a/docs/release_notes/0.147.0.md b/docs/release_notes/0.147.0.md new file mode 100644 index 0000000000..6972077643 --- /dev/null +++ b/docs/release_notes/0.147.0.md @@ -0,0 +1,23 @@ +# Release v0.147.0 + +## 🎯 Improvements + +- Use nodeAffinity to determine if an addon supports ARM64 (#6695) + +## 🐛 Bug Fixes + +- Fix CoreDNS probes for Kubernetes 1.26 (#6707) + +## 🧰 Maintenance + +- Add identity action to update-generated workflow (#6735) +- Bump dependencies (#6730) + +## 📝 Documentation + +- Update docs with \`preserve\` option to create addon resolveConflicts (#6729) + +## Acknowledgments + +Weaveworks would like to sincerely thank: +@wind0r diff --git a/docs/release_notes/0.148.0.md b/docs/release_notes/0.148.0.md new file mode 100644 index 0000000000..59497066c8 --- /dev/null +++ b/docs/release_notes/0.148.0.md @@ -0,0 +1,28 @@ +# Release v0.148.0 + +## 🚀 Features + +- Add support for `us-iso-east-1` and `us-isob-east-1` regions (#6759) + +## 🎯 Improvements + +- Replaced weaveworksbot with eksctlbot in workflows and actions (#6758) + +## 🐛 Bug Fixes + +- Fix index out of range error when aws-node, kube-proxy or coredns are missing (#6756) + +## 🧰 Maintenance + +- Bump dependencies (#6754, #6742) +- Migrate to sdk v2 - configuration loading (#6432) + +## 📝 Documentation + +- Fix documentation for EKS interface endpoint (#6747) +- Added new logo and favicon assets (#6746) + +## Acknowledgments +Weaveworks would like to sincerely thank: + @wind0r + diff --git a/docs/release_notes/0.149.0.md b/docs/release_notes/0.149.0.md new file mode 100644 index 0000000000..ff20f8b809 --- /dev/null +++ b/docs/release_notes/0.149.0.md @@ -0,0 +1,15 @@ +# Release v0.149.0 + +## 🚀 Features + +- Update current github urls with new eksctl-io github organisation urls (#6768) + +## 🐛 Bug Fixes + +- Fix \`AWS\_REGION\` and \`AWS\_DEFAULT\_REGION\` support for eksctl commands (#6787) +- Fix generating mocks for aws-sdk-go-v2 interfaces (#6777) + +## 🧰 Maintenance + +- Bump dependencies (#6788) +- Pin K8s dependencies chain to 1.25 (#6677) \ No newline at end of file diff --git a/docs/release_notes/0.150.0.md b/docs/release_notes/0.150.0.md new file mode 100644 index 0000000000..e4776d2eaa --- /dev/null +++ b/docs/release_notes/0.150.0.md @@ -0,0 +1,22 @@ +# Release v0.150.0 + +## 🚀 Features + +- Switch from Docker Hub registry to ECR registry (#6769) + +## 🐛 Bug Fixes + +- Update measurement ID for GA (#6822) + +## 🎯 Improvements + +- Migrate to mockery v2 (#6778) + +## 🧰 Maintenance + +- Free up disk space in release workflow before building binaries (#6827) +- Bump dependencies (#6803) + +## 📝 Documentation + +- Add announcement for transfer to new Github Organisation (#6805) diff --git a/docs/release_notes/0.151.0.md b/docs/release_notes/0.151.0.md new file mode 100644 index 0000000000..1ee6b98ffe --- /dev/null +++ b/docs/release_notes/0.151.0.md @@ -0,0 +1,27 @@ +# Release v0.151.0 + +## 🚀 Features + +- Support custom AMIs for self-managed Windows nodegroups (#6804) +- Support custom Ubuntu AMIs for EKS-managed nodegroups (#6850) + +## 🎯 Improvements + +- Remove support for EKS 1.22 (#6704) + +## 🐛 Bug Fixes + +- Fix error with tar in `Post Cache go-build and mod` step (#6840) +- Fix setting link-time variables for release version (#6841) +- Select one subnet for AZs where multiple are present and no VPC config provided (#6814) +- Paginate instance type offerings response (#6832) + + +## 🧰 Maintenance + +- Bump dependencies (#6852, #6859) +- Cleanup Flux Integration (#6836) + +## Acknowledgments +Weaveworks would like to sincerely thank: + @watany-dev diff --git a/docs/release_notes/0.152.0.md b/docs/release_notes/0.152.0.md new file mode 100644 index 0000000000..34ac922bcf --- /dev/null +++ b/docs/release_notes/0.152.0.md @@ -0,0 +1,21 @@ +# Release v0.152.0 + +## 🚀 Features + +- Add support for Tel Aviv (il-central-1) (#6899) +- Add option to print specific events when running `eksctl describe-stacks` (#6851) + +## 🐛 Bug Fixes + +- Fix PR Rebase workflow (#6903) + +## 🧰 Maintenance + +- Bump dependencies (#6920, #6895, #6874) +- Pin actions to a full length commit SHA (#6901) +- Fix `k8s.io/kubernetes` version (#6868) +- Fix setting link-time variables for release version (#6841) + +## 📝 Documentation + +- Remove `iam:ListInstanceProfiles` from the required permissions list (#6898) diff --git a/docs/release_notes/0.153.0.md b/docs/release_notes/0.153.0.md new file mode 100644 index 0000000000..7dbcc8470c --- /dev/null +++ b/docs/release_notes/0.153.0.md @@ -0,0 +1,20 @@ +# Release v0.153.0 + +## 🚀 Features + +- Update Bottlerocket image version on nodegroup upgrade (#6923) + +## 🎯 Improvements + +- Improve error message when `overrideBootstrapCommand` is required for `customAMIs` (#6897) + +## 🐛 Bug Fixes + +- Allow setting cluster-dns-ip for Bottlerocket (#6931) + +## 🧰 Maintenance + +- Unit test creating the EKS provider (#6875) +- Remove PR rebase workflow (#6934) +- Bump dependencies and Update build image tag (#6937, #6946) + diff --git a/docs/release_notes/0.154.0.md b/docs/release_notes/0.154.0.md new file mode 100644 index 0000000000..0a72b98984 --- /dev/null +++ b/docs/release_notes/0.154.0.md @@ -0,0 +1,14 @@ +# Release v0.154.0 + +## 🐛 Bug Fixes + +- Fix error message for Bottlerocket validation (#6967) +- Don't wait for `aws-efs-csi-driver` addon if cluster has no nodegroups (#6960) + +## 🧰 Maintenance + +- Bring Windows integration test runtime down to less than half (#6965) + +## 📝 Documentation + +- Add references to Enterprise support with Flux on Gitops page (#6968) diff --git a/docs/release_notes/0.155.0.md b/docs/release_notes/0.155.0.md new file mode 100644 index 0000000000..aa62cefa05 --- /dev/null +++ b/docs/release_notes/0.155.0.md @@ -0,0 +1,22 @@ +# Release v0.155.0 + +## 🚀 Features + +- Add support for us-iso-west-1 region (#6997) + +## 🎯 Improvements + +- Add validations for managed nodegroup labels (#6947) +- Switch default volume type back to gp3 for ISO regions (#6969) + +## 🐛 Bug Fixes + +- Fix merge release workflow when there is nothing to merge (#6993) + +## 🧰 Maintenance + +- Update Ginkgo (#6996) +- Replace deprecated Ginkgo CLI options (#6994) +- Improve unit tests' runtime (#6992) +- Bump dependencies (#6998) + diff --git a/docs/release_notes/0.156.0.md b/docs/release_notes/0.156.0.md new file mode 100644 index 0000000000..4d25c2033e --- /dev/null +++ b/docs/release_notes/0.156.0.md @@ -0,0 +1,14 @@ +# Release v0.156.0 + +## 🚀 Features + +- Adopters for eksctl (#7027) + +## 🐛 Bug Fixes + +- Cleanup subnets with invalid AZs before importing VPC from CFN stack (#6935) + +## 🧰 Maintenance + +- Bump dependencies (#7025) + diff --git a/docs/release_notes/0.157.0.md b/docs/release_notes/0.157.0.md new file mode 100644 index 0000000000..452eb2e700 --- /dev/null +++ b/docs/release_notes/0.157.0.md @@ -0,0 +1,14 @@ +# Release v0.157.0 + +## 🚀 Features + +- Material version updates and added social cards, cookie consent and feedback widgets (#7050) + +## 🐛 Bug Fixes + +- Fix `update aws node` workflow (#7045) +- Disallow passing a vpc.securityGroup with external security group rules (#7030) + +## 📝 Documentation + +- Add note on how to use `--include/exclude` flags when creating iamserviceaccounts (#7047) diff --git a/docs/release_notes/0.158.0.md b/docs/release_notes/0.158.0.md new file mode 100644 index 0000000000..e09ee6e490 --- /dev/null +++ b/docs/release_notes/0.158.0.md @@ -0,0 +1,19 @@ +# Release v0.158.0 + +## 🐛 Bug Fixes + +- Call `kubectl version` command with `--output=json` flag (#7032) + +## 🧰 Maintenance + +- Bump `github.com/cloudflare/cfssl` to fix indirect deps DOS vulnerability (#7067) +- Upgrade goproxy to fix DoS vulnerability (#7068) + +## 📝 Documentation + +- Corrected Chocolatey Install Command (#7063) + +## Acknowledgments + +Weaveworks would like to sincerely thank: + @Nyami diff --git a/docs/release_notes/0.159.0.md b/docs/release_notes/0.159.0.md new file mode 100644 index 0000000000..f8ca55d2d3 --- /dev/null +++ b/docs/release_notes/0.159.0.md @@ -0,0 +1,14 @@ +# Release v0.159.0 + +## 🧰 Maintenance + +- Allow managed suite specs to run in parallel (#7065) +- Update to Go 1.20 (#7075) + +## 📝 Documentation + +- Fix doc example for bottlerocket bootstrap container (#7087) + +## Acknowledgments +Weaveworks would like to sincerely thank: +@jhart0 diff --git a/docs/release_notes/0.160.0.md b/docs/release_notes/0.160.0.md new file mode 100644 index 0000000000..3c9f89765c --- /dev/null +++ b/docs/release_notes/0.160.0.md @@ -0,0 +1,9 @@ +# Release v0.160.0 + +## 🚀 Features + +- Add support for EKS 1.28 (#7108) + +## 🧰 Maintenance + +- Bump dependencies (#7109) diff --git a/docs/release_notes/0.161.0.md b/docs/release_notes/0.161.0.md new file mode 100644 index 0000000000..b05a02e8a1 --- /dev/null +++ b/docs/release_notes/0.161.0.md @@ -0,0 +1,16 @@ +# Release v0.161.0 + +## 🚀 Features + +- Make EKS 1.27 default (#7117) +- Docs Landing page (#7092) + +## 🎯 Improvements + +- Refine log statements using `%w` for better formatting and UX (#7115) + +## 🧰 Maintenance + +- Update gomarkdown to fix out-of-bounds read while parsing citations (#7120) +- Upgrade go-restful (#7121) +- Move addons related tasks to actions package (#7077) diff --git a/docs/release_notes/0.162.0.md b/docs/release_notes/0.162.0.md new file mode 100644 index 0000000000..e198bc887d --- /dev/null +++ b/docs/release_notes/0.162.0.md @@ -0,0 +1,14 @@ +# Release v0.162.0 + +## 🎯 Improvements + +- Set AWS credential expiry window to 30 minutes (#7116) + +## 🐛 Bug Fixes + +- Fix ELB cleanup failure due to resource name ending with a hyphen (#7029) +- Fix coredns 1.28 asset (#7126) + +## Acknowledgments +Weaveworks would like to sincerely thank: +@0xlen and @otterley diff --git a/docs/release_notes/0.163.0.md b/docs/release_notes/0.163.0.md new file mode 100644 index 0000000000..ec03b4b751 --- /dev/null +++ b/docs/release_notes/0.163.0.md @@ -0,0 +1,24 @@ +# Release v0.163.0 + +## 🚀 Features + +- Add support for P5 instances (#7201) + +## 🎯 Improvements + +- Update coredns (#7179) +- Automatically update coredns assets using Github workflows (#7178) + +## 🐛 Bug Fixes + +- Update build distros workflow to save disk space (#7173) + +## 🧰 Maintenance + +- Fix kOps privilege escalation vulnerability, update permissions for stale workflow and dependencies (#7205) +- Bump dependencies and update build image (#7170) + +## Acknowledgments + +Weaveworks would like to sincerely thank: +@vadiml diff --git a/docs/release_notes/0.2.0.md b/docs/release_notes/0.2.0.md index 76527cb1e8..0feec64702 100644 --- a/docs/release_notes/0.2.0.md +++ b/docs/release_notes/0.2.0.md @@ -9,7 +9,7 @@ Albeit we have originally planned to do a number of things in 0.2.0, the plan has evolved. From now on, please refer to [our roadmap][]. [new release cadence]: https://eksctl.io/community/roadmap/ -[our roadmap]: https://github.com/weaveworks/eksctl/projects/2 +[our roadmap]: https://github.com/eksctl-io/eksctl/projects/2 ## Bug Fixes Since 0.1.40 diff --git a/docs/release_notes/0.2.1.md b/docs/release_notes/0.2.1.md index 75c697f1c9..d6696bf478 100644 --- a/docs/release_notes/0.2.1.md +++ b/docs/release_notes/0.2.1.md @@ -2,16 +2,16 @@ ## Bug Fixes Since 0.2.0 -- more explicit deprecation message for Kubernetes version 1.10 ([#1049](https://github.com/weaveworks/eksctl/issues/1049)) +- more explicit deprecation message for Kubernetes version 1.10 ([#1049](https://github.com/eksctl-io/eksctl/issues/1049)) ## Bug Fixes Since 0.1.40 -- remove support for Kubernetes version 1.10, as [deprecated by AWS from 22nd July 2019 onwards](https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html) ([#1026](https://github.com/weaveworks/eksctl/issues/1026)) +- remove support for Kubernetes version 1.10, as [deprecated by AWS from 22nd July 2019 onwards](https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html) ([#1026](https://github.com/eksctl-io/eksctl/issues/1026)) - remove `eksctl utils install-coredns` command that was only relevant to Kubernetes version 1.10 - remove `--strorage-class` flag that was only relevant to Kubernetes version 1.10 -- fix long-standing issue with EBS and security groups blocking VPC deletion ([#103](https://github.com/weaveworks/eksctl/issues/103)) -- add support for `aws eks get-token` as fallback when `aws-iam-authenticator` is missing ([#788](https://github.com/weaveworks/eksctl/issues/788)) -- add `volumeIOPS` field to enable use of EBS root volumes of type `io1` ([#1006](https://github.com/weaveworks/eksctl/issues/1006)) +- fix long-standing issue with EBS and security groups blocking VPC deletion ([#103](https://github.com/eksctl-io/eksctl/issues/103)) +- add support for `aws eks get-token` as fallback when `aws-iam-authenticator` is missing ([#788](https://github.com/eksctl-io/eksctl/issues/788)) +- add `volumeIOPS` field to enable use of EBS root volumes of type `io1` ([#1006](https://github.com/eksctl-io/eksctl/issues/1006)) ## New Features Since 0.1.0 diff --git a/docs/release_notes/0.3.0.md b/docs/release_notes/0.3.0.md index ecbf5ed3fe..1a5d0e6450 100644 --- a/docs/release_notes/0.3.0.md +++ b/docs/release_notes/0.3.0.md @@ -5,7 +5,7 @@ - add a new command: `eksctl install flux`, which, given a Git repository and an EKS cluster, will bootstrap Flux, installing it in the cluster and initializing its manifests in the Git repository. To use this command, the environment variable `EKSCTL_EXPERIMENTAL=true` must be set - allow enabling EKS control plane logging to CloudWatch (#704) - upgrade AWS VPC CNI plugin to 1.5 (#927) -- allow customizing kubelet feature gates (https://github.com/weaveworks/eksctl/issues/784#issuecomment-513704672) +- allow customizing kubelet feature gates (https://github.com/eksctl-io/eksctl/issues/784#issuecomment-513704672) - add support for Asia Pacific (Hong Kong) region (ap-east-1) diff --git a/docs/release_notes/0.47.0.md b/docs/release_notes/0.47.0.md index 67ecfeac40..fd55dd11a9 100644 --- a/docs/release_notes/0.47.0.md +++ b/docs/release_notes/0.47.0.md @@ -2,7 +2,7 @@ ## Improvements -- Use built-in AMI bootstrapping scripts for AL2/Ubuntu unmanaged nodes (#3564) (Notice: [Upcoming breaking change](https://github.com/weaveworks/eksctl/issues/3563)) +- Use built-in AMI bootstrapping scripts for AL2/Ubuntu unmanaged nodes (#3564) (Notice: [Upcoming breaking change](https://github.com/eksctl-io/eksctl/issues/3563)) - Load env from host into Flux exec (#3608) - Fix get nodegroups from stack that failed to delete (#3612) diff --git a/docs/release_notes/0.71.0.md b/docs/release_notes/0.71.0.md index d5b65cc2ea..409244e934 100644 --- a/docs/release_notes/0.71.0.md +++ b/docs/release_notes/0.71.0.md @@ -1,7 +1,7 @@ # Release 0.71.0 ## Breaking Changes -- [Breaking] Remove incomplete support for GPU instance types in Bottlerocket and Windows nodegroups ([#4238](https://github.com/weaveworks/eksctl/issues/4238)) +- [Breaking] Remove incomplete support for GPU instance types in Bottlerocket and Windows nodegroups ([#4238](https://github.com/eksctl-io/eksctl/issues/4238)) ## Features diff --git a/examples/32-windows-nodes-with-containerd.yaml b/examples/32-windows-nodes-with-containerd.yaml index 2f28287b38..6c7333f0a6 100644 --- a/examples/32-windows-nodes-with-containerd.yaml +++ b/examples/32-windows-nodes-with-containerd.yaml @@ -15,6 +15,12 @@ nodeGroups: maxSize: 3 containerRuntime: containerd + - name: custom-windows + amiFamily: WindowsServer2022FullContainer + ami: ami-01579b74557facaf7 + overrideBootstrapCommand: | + & $EKSBootstrapScriptFile -EKSClusterName "$EKSClusterName" -APIServerEndpoint "$APIServerEndpoint" -Base64ClusterCA "$Base64ClusterCA" -ContainerRuntime "containerd" -KubeletExtraArgs "$KubeletExtraArgs" 3>&1 4>&1 5>&1 6>&1 + managedNodeGroups: - name: linux-ng instanceType: t2.large diff --git a/go.mod b/go.mod index 262c5ff9fd..1a32f07580 100644 --- a/go.mod +++ b/go.mod @@ -3,45 +3,45 @@ // you may also need to run `make push-build-image` depending on what has changed module github.com/weaveworks/eksctl -go 1.18 +go 1.20 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/aws/amazon-ec2-instance-selector/v2 v2.4.1 - github.com/aws/aws-sdk-go v1.44.281 - github.com/aws/aws-sdk-go-v2 v1.18.0 - github.com/aws/aws-sdk-go-v2/config v1.18.25 - github.com/aws/aws-sdk-go-v2/credentials v1.13.24 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.28.7 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.29.0 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.26.0 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.21.0 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.10 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0 - github.com/aws/aws-sdk-go-v2/service/eks v1.27.12 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.10 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.11 - github.com/aws/aws-sdk-go-v2/service/iam v1.20.0 - github.com/aws/aws-sdk-go-v2/service/kms v1.22.0 - github.com/aws/aws-sdk-go-v2/service/outposts v1.27.10 - github.com/aws/aws-sdk-go-v2/service/ssm v1.36.4 - github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 - github.com/aws/smithy-go v1.13.5 + github.com/aws/amazon-ec2-instance-selector/v2 v2.4.2-0.20230601180523-74e721cb8c1e + github.com/aws/aws-sdk-go v1.46.0 + github.com/aws/aws-sdk-go-v2 v1.21.2 + github.com/aws/aws-sdk-go-v2/config v1.19.0 + github.com/aws/aws-sdk-go-v2/credentials v1.13.43 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.31.0 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.35.0 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.29.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.27.2 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.29.7 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.17.2 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.21.6 + github.com/aws/aws-sdk-go-v2/service/iam v1.22.7 + github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 + github.com/aws/aws-sdk-go-v2/service/outposts v1.30.2 + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 + github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 + github.com/aws/smithy-go v1.15.0 github.com/benjamintf1/unmarshalledmatchers v1.0.0 github.com/blang/semver v3.5.1+incompatible github.com/bxcodec/faker v2.0.1+incompatible github.com/cenk/backoff v2.2.1+incompatible - github.com/cloudflare/cfssl v1.6.3 - github.com/dave/dst v0.27.1 - github.com/dave/jennifer v1.6.1 + github.com/cloudflare/cfssl v1.6.4 + github.com/dave/dst v0.27.3 + github.com/dave/jennifer v1.7.0 github.com/dlespiau/kube-test-harness v0.0.0-20200915102055-a03579200ae8 - github.com/evanphx/json-patch/v5 v5.6.0 + github.com/evanphx/json-patch/v5 v5.7.0 github.com/fatih/color v1.15.0 github.com/github-release/github-release v0.10.0 github.com/gobwas/glob v0.2.3 github.com/gofrs/flock v0.8.1 - github.com/golangci/golangci-lint v1.50.1 - github.com/google/uuid v1.3.0 + github.com/golangci/golangci-lint v1.54.2 + github.com/google/uuid v1.3.1 github.com/goreleaser/goreleaser v1.11.5 github.com/hashicorp/go-version v1.6.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 @@ -49,31 +49,31 @@ require ( github.com/kris-nova/lolgopher v0.0.0-20210112022122-73f0047e8b65 github.com/kubicorn/kubicorn v0.0.0-20180829191017-06f6bce92acc github.com/lithammer/dedent v1.1.0 - github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1 - github.com/onsi/ginkgo/v2 v2.10.0 - github.com/onsi/gomega v1.27.8 + github.com/maxbrunsfeld/counterfeiter/v6 v6.6.2 + github.com/onsi/ginkgo/v2 v2.12.1 + github.com/onsi/gomega v1.28.0 github.com/orcaman/concurrent-map v1.0.0 - github.com/otiai10/copy v1.9.0 + github.com/otiai10/copy v1.14.0 github.com/pelletier/go-toml v1.9.5 github.com/pkg/errors v0.9.1 github.com/sethvargo/go-password v0.2.0 - github.com/spf13/afero v1.9.5 + github.com/spf13/afero v1.10.0 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - github.com/tidwall/gjson v1.14.4 + github.com/tidwall/gjson v1.17.0 github.com/tidwall/sjson v1.2.5 github.com/tj/assert v0.0.3 github.com/vburenin/ifacemaker v1.2.1 - github.com/vektra/mockery v1.1.2 + github.com/vektra/mockery/v2 v2.35.3 github.com/weaveworks/goformation/v4 v4.10.2-0.20230526082129-5f5eaa9609b8 - github.com/weaveworks/launcher v0.0.2-0.20200715141516-1ca323f1de15 github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848 github.com/xgfone/netaddr v0.5.1 - golang.org/x/crypto v0.9.0 - golang.org/x/oauth2 v0.8.0 - golang.org/x/sync v0.2.0 - golang.org/x/tools v0.9.3 + golang.org/x/crypto v0.14.0 + golang.org/x/exp v0.0.0-20231006140011-7918f672742d + golang.org/x/oauth2 v0.13.0 + golang.org/x/sync v0.4.0 + golang.org/x/tools v0.14.0 gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.11.2 k8s.io/api v0.26.0 @@ -81,35 +81,37 @@ require ( k8s.io/apimachinery v0.26.0 k8s.io/cli-runtime v0.26.0 k8s.io/client-go v0.26.0 - k8s.io/cloud-provider v0.25.2 - k8s.io/code-generator v0.25.0 - k8s.io/kops v1.25.2 - k8s.io/kubelet v0.25.2 - k8s.io/utils v0.0.0-20221107191617-1a15be271d1d + k8s.io/cloud-provider v0.25.5 + k8s.io/code-generator v0.25.11 + k8s.io/kops v1.25.4 + k8s.io/kubelet v0.25.5 + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 sigs.k8s.io/mdtoc v1.1.0 sigs.k8s.io/yaml v1.3.0 ) require ( - 4d63.com/gochecknoglobals v0.1.0 // indirect - cloud.google.com/go v0.105.0 // indirect - cloud.google.com/go/compute v1.14.0 // indirect + 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect + 4d63.com/gochecknoglobals v0.2.1 // indirect + cloud.google.com/go v0.110.7 // indirect + cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.8.0 // indirect - cloud.google.com/go/kms v1.6.0 // indirect - cloud.google.com/go/storage v1.27.0 // indirect + cloud.google.com/go/iam v1.1.1 // indirect + cloud.google.com/go/kms v1.15.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect code.gitea.io/sdk/gitea v0.15.1 // indirect - github.com/Abirdcfly/dupword v0.0.7 // indirect + github.com/4meepo/tagalign v1.3.2 // indirect + github.com/Abirdcfly/dupword v0.0.12 // indirect github.com/AlekSi/pointer v1.2.0 // indirect - github.com/Antonboom/errname v0.1.7 // indirect - github.com/Antonboom/nilnil v0.1.1 // indirect + github.com/Antonboom/errname v0.1.12 // indirect + github.com/Antonboom/nilnil v0.1.7 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect - github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect + github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect github.com/Azure/azure-storage-blob-go v0.15.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.28 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect @@ -117,9 +119,9 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/BurntSushi/toml v1.2.1 // indirect + github.com/BurntSushi/toml v1.3.2 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect - github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect + github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect @@ -127,72 +129,71 @@ require ( github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/Masterminds/squirrel v1.5.3 // indirect github.com/Microsoft/go-winio v0.6.0 // indirect - github.com/OpenPeeDeeP/depguard v1.1.1 // indirect + github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 // indirect github.com/acomagu/bufpipe v1.0.4 // indirect + github.com/alexkohler/nakedret/v2 v2.0.2 // indirect github.com/alexkohler/prealloc v1.0.0 // indirect github.com/alingse/asasalint v0.0.11 // indirect github.com/apparentlymart/go-cidr v1.1.0 // indirect - github.com/armon/go-metrics v0.4.0 // indirect + github.com/armon/go-metrics v0.4.1 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect - github.com/ashanbrown/forbidigo v1.3.0 // indirect + github.com/ashanbrown/forbidigo v1.6.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect github.com/atc0005/go-teams-notify/v2 v2.6.1 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/awslabs/goformation/v4 v4.19.5 // indirect - github.com/aymanbagabas/go-osc52 v1.0.3 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/bkielbasa/cyclop v1.2.0 // indirect + github.com/bkielbasa/cyclop v1.2.1 // indirect github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/blizzy78/varnamelen v0.8.0 // indirect - github.com/bombsimon/wsl/v3 v3.3.0 // indirect - github.com/breml/bidichk v0.2.3 // indirect - github.com/breml/errchkjson v0.3.0 // indirect - github.com/butuzov/ireturn v0.1.1 // indirect + github.com/bombsimon/wsl/v3 v3.4.0 // indirect + github.com/breml/bidichk v0.2.4 // indirect + github.com/breml/errchkjson v0.3.1 // indirect + github.com/butuzov/ireturn v0.2.0 // indirect + github.com/butuzov/mirror v1.1.0 // indirect github.com/caarlos0/ctrlc v1.2.0 // indirect github.com/caarlos0/env/v6 v6.10.1 // indirect github.com/caarlos0/go-reddit/v3 v3.0.1 // indirect github.com/caarlos0/go-shellwords v1.0.12 // indirect github.com/caarlos0/log v0.1.6 // indirect github.com/cavaliergopher/cpio v1.0.1 // indirect + github.com/ccojocar/zxcvbn-go v1.0.1 // indirect github.com/cenkalti/backoff/v3 v3.0.0 // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect - github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect - github.com/charithe/durationcheck v0.0.9 // indirect - github.com/charmbracelet/bubbles v0.13.0 // indirect - github.com/charmbracelet/bubbletea v0.21.0 // indirect - github.com/charmbracelet/lipgloss v0.6.1-0.20220911181249-6304a734e792 // indirect - github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect - github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect - github.com/cncf/xds/go v0.0.0-20211216145620-d92e9ce0af51 // indirect - github.com/containerd/console v1.0.3 // indirect + github.com/charithe/durationcheck v0.0.10 // indirect + github.com/charmbracelet/bubbles v0.15.0 // indirect + github.com/charmbracelet/bubbletea v0.24.1 // indirect + github.com/charmbracelet/lipgloss v0.7.1 // indirect + github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect + github.com/chigopher/pathlib v0.15.0 // indirect + github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/containerd/containerd v1.6.18 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.12.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect - github.com/daixiang0/gci v0.8.1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/daixiang0/gci v0.11.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/denis-tingaikin/go-header v0.4.3 // indirect github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb // indirect github.com/dghubble/oauth1 v0.7.1 // indirect @@ -207,24 +208,21 @@ require ( github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-metrics v0.0.1 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect - github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect + github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/emirpasic/gods v1.12.0 // indirect - github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect - github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/evertras/bubble-table v0.14.4 // indirect + github.com/evertras/bubble-table v0.15.2 // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/structtag v1.2.0 // indirect github.com/firefart/nonamedreturns v1.0.4 // indirect - github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/fullstorydev/grpcurl v1.8.1 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect - github.com/go-critic/go-critic v0.6.5 // indirect + github.com/go-critic/go-critic v0.9.0 // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect github.com/go-git/go-billy/v5 v5.3.1 // indirect @@ -237,18 +235,17 @@ require ( github.com/go-openapi/swag v0.19.14 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect - github.com/go-toolsmith/astcast v1.0.0 // indirect - github.com/go-toolsmith/astcopy v1.0.2 // indirect - github.com/go-toolsmith/astequal v1.0.3 // indirect - github.com/go-toolsmith/astfmt v1.0.0 // indirect - github.com/go-toolsmith/astp v1.0.0 // indirect - github.com/go-toolsmith/strparse v1.0.0 // indirect - github.com/go-toolsmith/typep v1.0.2 // indirect - github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect + github.com/go-toolsmith/astcast v1.1.0 // indirect + github.com/go-toolsmith/astcopy v1.1.0 // indirect + github.com/go-toolsmith/astequal v1.1.0 // indirect + github.com/go-toolsmith/astfmt v1.1.0 // indirect + github.com/go-toolsmith/astp v1.1.0 // indirect + github.com/go-toolsmith/strparse v1.1.0 // indirect + github.com/go-toolsmith/typep v1.1.0 // indirect + github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect @@ -257,25 +254,26 @@ require ( github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect - github.com/golangci/misspell v0.3.5 // indirect + github.com/golangci/misspell v0.4.1 // indirect github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect - github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 // indirect - github.com/google/btree v1.0.1 // indirect - github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect + github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/certificate-transparency-go v1.1.4 // indirect github.com/google/gnostic v0.6.9 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/go-containerregistry v0.11.0 // indirect + github.com/google/go-containerregistry v0.12.1 // indirect github.com/google/go-github/v47 v47.1.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20230508170847-c6d6667b8fd4 // indirect + github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect + github.com/google/s2a-go v0.1.7 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/wire v0.5.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect - github.com/gophercloud/gophercloud v1.0.0 // indirect - github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/gophercloud/gophercloud v1.1.1 // indirect + github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect github.com/goreleaser/chglog v0.4.2 // indirect github.com/goreleaser/fileglob v1.3.0 // indirect github.com/goreleaser/nfpm/v2 v2.30.1 // indirect @@ -287,15 +285,12 @@ require ( github.com/gostaticanalysis/nilerr v0.1.1 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.2.0 // indirect + github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-plugin v1.4.3 // indirect + github.com/hashicorp/go-plugin v1.4.5 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect @@ -305,60 +300,61 @@ require ( github.com/hashicorp/go-uuid v1.0.2 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hashicorp/vault/api v1.8.0 // indirect + github.com/hashicorp/vault/api v1.8.2 // indirect github.com/hashicorp/vault/sdk v0.6.0 // indirect github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect github.com/hexops/gotextdiff v1.0.3 // indirect github.com/huandu/xstrings v1.4.0 // indirect github.com/iancoleman/orderedmap v0.2.0 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/invopop/jsonschema v0.7.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect github.com/jgautheron/goconst v1.5.1 // indirect - github.com/jhump/protoreflect v1.8.2 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect + github.com/jinzhu/copier v0.4.0 // indirect github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect - github.com/jonboulle/clockwork v0.2.2 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/julz/importas v0.1.0 // indirect github.com/kevinburke/rest v0.0.0-20210106114233-22cd0577e450 // indirect github.com/kevinburke/ssh_config v1.1.0 // indirect - github.com/kisielk/errcheck v1.6.2 // indirect + github.com/kisielk/errcheck v1.6.3 // indirect github.com/kisielk/gotool v1.0.0 // indirect - github.com/kkHAIKE/contextcheck v1.1.3 // indirect - github.com/klauspost/compress v1.16.5 // indirect + github.com/kkHAIKE/contextcheck v1.1.4 // indirect + github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/pgzip v1.2.6 // indirect github.com/kr/fs v0.1.0 // indirect github.com/kris-nova/novaarchive v0.0.0-20210219195539-c7c1cabb2577 // indirect github.com/kulti/thelper v0.6.3 // indirect - github.com/kunwardeep/paralleltest v1.0.6 // indirect - github.com/kyoh86/exportloopref v0.1.8 // indirect + github.com/kunwardeep/paralleltest v1.0.8 // indirect + github.com/kyoh86/exportloopref v0.1.11 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/ldez/gomoddirectives v0.2.3 // indirect - github.com/ldez/tagliatelle v0.3.1 // indirect - github.com/leonklingele/grouper v1.1.0 // indirect - github.com/lib/pq v1.10.7 // indirect + github.com/ldez/tagliatelle v0.5.0 // indirect + github.com/leonklingele/grouper v1.1.1 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lufeee/execinquery v1.2.1 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/mailru/easyjson v0.7.6 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/maratori/testableexamples v1.0.0 // indirect - github.com/maratori/testpackage v1.1.0 // indirect - github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect + github.com/maratori/testpackage v1.1.1 // indirect + github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-ieproxy v0.0.1 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect - github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-localereader v0.0.1 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // indirect - github.com/mgechev/revive v1.2.4 // indirect + github.com/mgechev/revive v1.3.2 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect @@ -368,96 +364,96 @@ require ( github.com/mmarkdown/mmark v2.0.40+incompatible // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/spdystream v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/moricho/tparallel v0.2.1 // indirect + github.com/moricho/tparallel v0.3.1 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect - github.com/muesli/cancelreader v0.2.0 // indirect + github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/mango v0.1.0 // indirect github.com/muesli/mango-cobra v1.2.0 // indirect github.com/muesli/mango-pflag v0.1.0 // indirect github.com/muesli/reflow v0.3.0 // indirect github.com/muesli/roff v0.1.0 // indirect - github.com/muesli/termenv v0.12.1-0.20220901123159-d729275e0977 // indirect + github.com/muesli/termenv v0.15.1 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nakabonne/nestif v0.3.1 // indirect - github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect - github.com/nishanths/exhaustive v0.8.3 // indirect + github.com/nishanths/exhaustive v0.11.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect + github.com/nunnatsa/ginkgolinter v0.13.5 // indirect github.com/oklog/run v1.0.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc3 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect github.com/pierrec/lz4 v2.5.2+incompatible // indirect github.com/pkg/sftp v1.13.5 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/polyfloyd/go-errorlint v1.0.5 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/polyfloyd/go-errorlint v1.4.4 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/quasilyte/go-ruleguard v0.3.18 // indirect - github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect - github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect + github.com/quasilyte/go-ruleguard v0.4.0 // indirect + github.com/quasilyte/gogrep v0.5.0 // indirect + github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/rivo/uniseg v0.4.2 // indirect + github.com/rs/zerolog v1.31.0 // indirect github.com/rubenv/sql-migrate v1.3.1 // indirect github.com/russross/blackfriday v1.6.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/ryancurrah/gomodguard v1.2.4 // indirect - github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect + github.com/ryancurrah/gomodguard v1.3.0 // indirect + github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/sagikazarmark/locafero v0.3.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sahilm/fuzzy v0.1.0 // indirect github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b // indirect github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 // indirect - github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect + github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect - github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect - github.com/securego/gosec/v2 v2.13.1 // indirect + github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect + github.com/securego/gosec/v2 v2.17.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/sirupsen/logrus v1.9.0 // indirect - github.com/sivchari/containedctx v1.0.2 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/sivchari/containedctx v1.0.3 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect - github.com/sivchari/tenv v1.7.0 // indirect + github.com/sivchari/tenv v1.7.1 // indirect github.com/slack-go/slack v0.11.3 // indirect - github.com/soheilhy/cmux v0.1.5 // indirect - github.com/sonatard/noctx v0.0.1 // indirect + github.com/sonatard/noctx v0.0.2 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect github.com/sourcegraph/go-diff v0.7.1-0.20230316160316-1b4d09c1adcb // indirect - github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.15.0 // indirect - github.com/spotinst/spotinst-sdk-go v1.129.0 // indirect + github.com/spf13/cast v1.5.1 // indirect + github.com/spf13/viper v1.17.0 // indirect + github.com/spotinst/spotinst-sdk-go v1.133.0 // indirect github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/subosito/gotenv v1.4.2 // indirect - github.com/tdakkota/asciicheck v0.1.1 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect + github.com/tdakkota/asciicheck v0.2.0 // indirect github.com/technoweenie/multipartstreamer v1.0.1 // indirect - github.com/tetafro/godot v1.4.11 // indirect + github.com/tetafro/godot v1.4.14 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect - github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect - github.com/timonwong/loggercheck v0.9.3 // indirect - github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect - github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect + github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect + github.com/timonwong/loggercheck v0.9.4 // indirect + github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect github.com/ulikunitz/xz v0.5.11 // indirect - github.com/ultraware/funlen v0.0.3 // indirect + github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.0.5 // indirect - github.com/urfave/cli v1.22.5 // indirect - github.com/uudashr/gocognit v1.0.6 // indirect + github.com/uudashr/gocognit v1.0.7 // indirect github.com/vbatts/tar-split v0.11.2 // indirect github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 // indirect @@ -466,77 +462,56 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect + github.com/xen0n/gosmopolitan v1.2.1 // indirect github.com/xlab/treeprint v1.1.0 // indirect github.com/yagipy/maintidx v1.0.0 // indirect github.com/yeya24/promlinter v0.2.0 // indirect - gitlab.com/bosi/decorder v0.2.3 // indirect + github.com/ykadowak/zerologlint v0.1.3 // indirect + gitlab.com/bosi/decorder v0.4.0 // indirect gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect - go.etcd.io/bbolt v1.3.6 // indirect - go.etcd.io/etcd/api/v3 v3.5.6 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect - go.etcd.io/etcd/client/v2 v2.305.6 // indirect - go.etcd.io/etcd/client/v3 v3.5.6 // indirect - go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect - go.etcd.io/etcd/raft/v3 v3.5.0 // indirect - go.etcd.io/etcd/server/v3 v3.5.0 // indirect - go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/v3 v3.5.0-alpha.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib v0.20.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect - go.opentelemetry.io/otel v1.3.0 // indirect - go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect - go.opentelemetry.io/otel/metric v0.20.0 // indirect - go.opentelemetry.io/otel/sdk v1.3.0 // indirect - go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect - go.opentelemetry.io/otel/trace v1.3.0 // indirect - go.opentelemetry.io/proto/otlp v0.11.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/goleak v1.1.12 // indirect - go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.21.0 // indirect + go.tmz.dev/musttag v0.7.2 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.24.0 // indirect gocloud.dev v0.26.0 // indirect - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect - golang.org/x/mod v0.10.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/term v0.8.0 // indirect - golang.org/x/text v0.10.0 // indirect - golang.org/x/time v0.1.0 // indirect + golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect + golang.org/x/mod v0.13.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.107.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 // indirect - google.golang.org/grpc v1.52.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/api v0.143.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect + google.golang.org/grpc v1.58.2 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect - gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/gcfg.v1 v1.2.3 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/mail.v2 v2.3.1 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/tools v0.3.3 // indirect + honnef.co/go/tools v0.4.5 // indirect k8s.io/apiserver v0.26.0 // indirect - k8s.io/cloud-provider-aws v1.25.0 // indirect + k8s.io/cloud-provider-aws v1.25.1 // indirect k8s.io/component-base v0.26.0 // indirect - k8s.io/csi-translation-lib v0.25.2 // indirect - k8s.io/gengo v0.0.0-20220913193501-391367153a38 // indirect + k8s.io/csi-translation-lib v0.25.5 // indirect + k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect k8s.io/klog/v2 v2.80.1 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect k8s.io/kubectl v0.26.0 // indirect - mvdan.cc/gofumpt v0.4.0 // indirect + mvdan.cc/gofumpt v0.5.0 // indirect mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect - mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect + mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect oras.land/oras-go v1.2.2 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect @@ -546,50 +521,35 @@ require ( replace ( // Used to pin the k8s library versions regardless of what other dependencies enforce - k8s.io/api => k8s.io/api v0.23.12 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.12 - k8s.io/apimachinery => k8s.io/apimachinery v0.23.13-rc.0 - k8s.io/apiserver => k8s.io/apiserver v0.23.12 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.1 - k8s.io/client-go => k8s.io/client-go v0.24.0-alpha.4 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.12 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.12 - k8s.io/code-generator => k8s.io/code-generator v0.23.13-rc.0 - k8s.io/component-base => k8s.io/component-base v0.23.12 - k8s.io/component-helpers => k8s.io/component-helpers v0.23.12 - k8s.io/controller-manager => k8s.io/controller-manager v0.23.12 - k8s.io/cri-api => k8s.io/cri-api v0.23.13-rc.0 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.12 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.12 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.12 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.12 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.12 - k8s.io/kubectl => k8s.io/kubectl v0.24.1 - k8s.io/kubelet => k8s.io/kubelet v0.23.12 - k8s.io/kubernetes => k8s.io/kubernetes v1.22.12 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.12 - k8s.io/metrics => k8s.io/metrics v0.23.12 - k8s.io/mount-utils => k8s.io/mount-utils v0.23.13-rc.0 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.12 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.12 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.12 - k8s.io/sample-controller => k8s.io/sample-controller v0.23.12 + k8s.io/api => k8s.io/api v0.25.11 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.11 + k8s.io/apimachinery => k8s.io/apimachinery v0.25.11 + k8s.io/apiserver => k8s.io/apiserver v0.25.11 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.11 + k8s.io/client-go => k8s.io/client-go v0.25.11 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.11 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.11 + k8s.io/code-generator => k8s.io/code-generator v0.25.11 + k8s.io/component-base => k8s.io/component-base v0.25.11 + k8s.io/component-helpers => k8s.io/component-helpers v0.25.11 + k8s.io/controller-manager => k8s.io/controller-manager v0.25.11 + k8s.io/cri-api => k8s.io/cri-api v0.25.11 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.11 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.11 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.11 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.11 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.11 + k8s.io/kubectl => k8s.io/kubectl v0.25.5 + k8s.io/kubelet => k8s.io/kubelet v0.25.11 + k8s.io/kubernetes => k8s.io/kubernetes v1.25.11 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.11 + k8s.io/metrics => k8s.io/metrics v0.25.11 + k8s.io/mount-utils => k8s.io/mount-utils v0.25.11 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.11 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.11 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.11 + k8s.io/sample-controller => k8s.io/sample-controller v0.25.11 ) // Ensure k8s dependencies are also pinned accordingly -replace ( - github.com/acomagu/bufpipe => github.com/acomagu/bufpipe v1.0.4 - // TODO: drop this pin after upgrading kubectl to 0.25 - github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 - go.etcd.io/etcd/pkg/v3 => go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 - go.opentelemetry.io/contrib => go.opentelemetry.io/contrib v0.20.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 - go.opentelemetry.io/otel => go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/exporters/otlp => go.opentelemetry.io/otel/exporters/otlp v0.20.0 - go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.20.0 - go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v0.20.0 - go.opentelemetry.io/otel/sdk/export/metric => go.opentelemetry.io/otel/sdk/export/metric v0.20.0 - go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v0.20.0 - go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0 - go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0 -) +replace github.com/acomagu/bufpipe => github.com/acomagu/bufpipe v1.0.4 diff --git a/go.sum b/go.sum index 68712a5e9e..1d173802f2 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,10 @@ -4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0= -4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= -bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= -bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= +4d63.com/gocheckcompilerdirectives v1.2.1 h1:AHcMYuw56NPjq/2y615IGg2kYkBdTvOaojYCBcRE7MA= +4d63.com/gocheckcompilerdirectives v1.2.1/go.mod h1:yjDJSxmDTtIHHCqX0ufRYZDL6vQtMG7tJdKVeWwsqvs= +4d63.com/gochecknoglobals v0.2.1 h1:1eiorGsgHOFOuoOiJDy2psSrQbRdIHrlge0IJIkUgDc= +4d63.com/gochecknoglobals v0.2.1/go.mod h1:KRE8wtJB3CXCsb1xy421JfTHIIbmT3U5ruxw2Qu8fSU= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -37,8 +35,8 @@ cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Ud cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y= -cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= +cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -49,8 +47,8 @@ cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTB cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0= -cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= +cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= @@ -60,13 +58,12 @@ cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= -cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= -cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= +cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI= cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= -cloud.google.com/go/kms v1.6.0 h1:OWRZzrPmOZUzurjI2FBGtgY2mB1WaJkqhw6oIwSj0Yg= -cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= +cloud.google.com/go/kms v1.15.0 h1:xYl5WEaSekKYN5gGRyhjvZKM22GVBBCzegGNVPy+aIs= +cloud.google.com/go/kms v1.15.0/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= cloud.google.com/go/monitoring v1.1.0/go.mod h1:L81pzz7HKn14QCMaCs6NTQkdBnE87TElyanS95vIcl4= cloud.google.com/go/monitoring v1.4.0/go.mod h1:y6xnxfwI3hTFWOdkOaD7nfJVlwuC3/mS/5kvtT131p4= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -75,7 +72,6 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.19.0/go.mod h1:/O9kmSe9bb9KRnIAWkzmqhPjHo6LtzGOBYd/kr06XSs= cloud.google.com/go/secretmanager v1.3.0/go.mod h1:+oLTkouyiYiabAQNugCeTS3PAArGiMJuBqvJnJsyH+U= -cloud.google.com/go/spanner v1.17.0/go.mod h1:+17t2ixFwRG4lWRwE+5kipDR9Ef07Jkmc8z0IbMDKUs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -83,65 +79,53 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKuqnZI01LAA= -cloud.google.com/go/storage v1.27.0 h1:YOO045NZI9RKfCj1c5A/ZtuuENUc8OAW+gHdGnDgyMQ= -cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= cloud.google.com/go/trace v1.2.0/go.mod h1:Wc8y/uYyOhPy12KEnXG9XGrvfMz5F5SrYecQlbW1rwM= code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= -code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= -contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= -contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= -contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= -contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Abirdcfly/dupword v0.0.7 h1:z14n0yytA3wNO2gpCD/jVtp/acEXPGmYu0esewpBt6Q= -github.com/Abirdcfly/dupword v0.0.7/go.mod h1:K/4M1kj+Zh39d2aotRwypvasonOyAMH1c/IZJzE0dmk= +github.com/4meepo/tagalign v1.3.2 h1:1idD3yxlRGV18VjqtDbqYvQ5pXqQS0wO2dn6M3XstvI= +github.com/4meepo/tagalign v1.3.2/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE= +github.com/Abirdcfly/dupword v0.0.12 h1:56NnOyrXzChj07BDFjeRA+IUzSz01jmzEq+G4kEgFhc= +github.com/Abirdcfly/dupword v0.0.12/go.mod h1:+us/TGct/nI9Ndcbcp3rgNcQzctTj68pq7TcgNpLfdI= github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= -github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako= -github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= -github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q= -github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI= -github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= +github.com/Antonboom/errname v0.1.12 h1:oh9ak2zUtsLp5oaEd/erjB4GPu9w19NyoIskZClDcQY= +github.com/Antonboom/errname v0.1.12/go.mod h1:bK7todrzvlaZoQagP1orKzWXv59X/x0W0Io2XT1Ssro= +github.com/Antonboom/nilnil v0.1.7 h1:ofgL+BA7vlA1K2wNQOsHzLJ2Pw5B5DpWRLdDAVvvTow= +github.com/Antonboom/nilnil v0.1.7/go.mod h1:TP+ScQWVEq0eSIxqU8CbdT5DFWoHp0MbP+KMUO1BKYQ= github.com/Azure/azure-amqp-common-go/v3 v3.2.1/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI= github.com/Azure/azure-amqp-common-go/v3 v3.2.2/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v59.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v66.0.0+incompatible h1:bmmC38SlE8/E81nNADlgmVGurPWMHDX2YNXVQMrBpEE= -github.com/Azure/azure-sdk-for-go v66.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v67.1.0+incompatible h1:oziYcaopbnIKfM69DL05wXdypiqfrUKdxUKrKpynJTw= +github.com/Azure/azure-sdk-for-go v67.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= -github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= github.com/Azure/azure-service-bus-go v0.11.5/go.mod h1:MI6ge2CuQWBVq+ly456MY7XqNLJip5LO1iSFodbNLbU= -github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk= github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58= github.com/Azure/go-amqp v0.16.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= github.com/Azure/go-amqp v0.16.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.22/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs= github.com/Azure/go-autorest/autorest v0.11.24/go.mod h1:G6kyRlFnTuSbEYkQGawPfsCswgme4iYf6rfSKUDzbCc= +github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM= github.com/Azure/go-autorest/autorest v0.11.28/go.mod h1:MrkzG3Y3AH668QyF9KRk5neJnGgmhQ6krbhR8Q5eMvA= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= @@ -149,8 +133,9 @@ github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4Uw github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/adal v0.9.17/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= -github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= +github.com/Azure/go-autorest/autorest/adal v0.9.21 h1:jjQnVFXPfekaqb8vIsv2G1lxshoW+oGv4MDlhRtnYZk= +github.com/Azure/go-autorest/autorest/adal v0.9.21/go.mod h1:zua7mBUaCc5YnSLKYgGJR/w5ePdMDA6H56upLsHzA9U= github.com/Azure/go-autorest/autorest/azure/auth v0.5.9/go.mod h1:hg3/1yw0Bq87O3KvvnJoAh34/0zbP7SFizX/qN5JvjU= github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 h1:P6bYXFoao05z5uhOQzbC3Qd8JqF3jUoocoTeIxkp2cA= github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg= @@ -171,36 +156,28 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 h1:3ZBs7LAezy8gh0uECsA6CGU43FF3zsx5f4eah5FxTMA= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0/go.mod h1:rZLTje5A9kFBe0pzhpe2TdhRniBF++PRHQuRpR8esVc= github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbPSRmHvSXXHOwGRyeXh1jVdquA2G8= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/MakeNowJust/heredoc/v2 v2.0.1 h1:rlCHh70XXXv7toz95ajQWOWQnN4WNLt0TdpZYIR/J6A= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= @@ -215,10 +192,9 @@ github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2y github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Microsoft/hcsshim v0.9.6 h1:VwnDOgLeoi2du6dAznfmspNqTiwczvjv4K7NxuY9jsY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= -github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= +github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY= +github.com/OpenPeeDeeP/depguard/v2 v2.1.0/go.mod h1:PUBgk35fX4i7JDmwzlJwJ+GMe6NfO1723wmJMgPThNQ= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 h1:XcF0cTDJeiuZ5NU8w7WUDge0HRwwNRmxj/GGk6KSA6g= github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= @@ -227,20 +203,16 @@ github.com/ProtonMail/gopenpgp/v2 v2.2.2 h1:u2m7xt+CZWj88qK1UUNBoXeJCFJwJCZ/Ff4y github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/a8m/expect v1.0.0/go.mod h1:4IwSCMumY49ScypDnjNbYEjgVeqy1/U2cEs3Lat96eA= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alexkohler/nakedret/v2 v2.0.2 h1:qnXuZNvv3/AxkAb22q/sEsEpcA99YxLFACDtEw9TPxE= +github.com/alexkohler/nakedret/v2 v2.0.2/go.mod h1:2b8Gkk0GsOrqQv/gPWjNLDSKwG8I5moSXG1K4VIBcTQ= github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= @@ -248,139 +220,132 @@ github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqr github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -github.com/apache/beam v2.28.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu/ACaQhYjeefzQ0y1o= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= -github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= -github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= -github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= -github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= +github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/ashanbrown/forbidigo v1.3.0 h1:VkYIwb/xxdireGAdJNZoo24O4lmnEWkactplBlWTShc= -github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= +github.com/ashanbrown/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8gerOIVIY= +github.com/ashanbrown/forbidigo v1.6.0/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU= github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/atc0005/go-teams-notify/v2 v2.6.1 h1:t22ybzQuaQs4UJe4ceF5VYGsPhs6ir3nZOId/FBy6Go= github.com/atc0005/go-teams-notify/v2 v2.6.1/go.mod h1:xo6GejLDHn3tWBA181F8LrllIL0xC1uRsRxq7YNXaaY= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aws/amazon-ec2-instance-selector/v2 v2.4.1 h1:DmxtwV+pkakkVRhxKcAgnLbxCxvT7k8DBG271dfKPZ8= -github.com/aws/amazon-ec2-instance-selector/v2 v2.4.1/go.mod h1:AEJrtkLkCkfIBIazidrVrgZqaXl+9dxI/wRgjdw+7G0= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/amazon-ec2-instance-selector/v2 v2.4.2-0.20230601180523-74e721cb8c1e h1:zWGlJnXe5BLiqYuIHozuCGH5imE12AVhi2ss68pbpxI= +github.com/aws/amazon-ec2-instance-selector/v2 v2.4.2-0.20230601180523-74e721cb8c1e/go.mod h1:X1GFUTX6aorSJmVLgfAD56jdNPvnNSOIpsRLgxA1LLE= github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.281 h1:z/ptheJvINaIAsKXthxONM+toTKw2pxyk700Hfm6yUw= -github.com/aws/aws-sdk-go v1.44.281/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aws/aws-sdk-go v1.46.0 h1:Igh7W8P+sA6mXJ9yhreOSweefLapcqekhxQlY1llxcM= +github.com/aws/aws-sdk-go v1.46.0/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY= -github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= +github.com/aws/aws-sdk-go-v2 v1.16.15/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= +github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM= github.com/aws/aws-sdk-go-v2/config v1.15.3/go.mod h1:9YL3v07Xc/ohTsxFXzan9ZpFpdTOFl4X65BAKYaz8jg= -github.com/aws/aws-sdk-go-v2/config v1.18.25 h1:JuYyZcnMPBiFqn87L2cRppo+rNwgah6YwD3VuyvaW6Q= -github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= +github.com/aws/aws-sdk-go-v2/config v1.19.0 h1:AdzDvwH6dWuVARCl3RTLGRc4Ogy+N7yLFxVxXe1ClQ0= +github.com/aws/aws-sdk-go-v2/config v1.19.0/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= github.com/aws/aws-sdk-go-v2/credentials v1.11.2/go.mod h1:j8YsY9TXTm31k4eFhspiQicfXPLZ0gYXA50i4gxPE8g= -github.com/aws/aws-sdk-go-v2/credentials v1.13.24 h1:PjiYyls3QdCrzqUN35jMWtUK1vqVZ+zLfdOa/UPFDp0= -github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3/go.mod h1:uk1vhHHERfSVCUnqSqz8O48LBYDSC+k6brng09jcMOk= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 h1:jJPgroehGvjrde3XufFIJUZVK5A2L9a3KwSFgKy9n8w= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3 h1:ir7iEq78s4txFGgwcLqD6q9IIPzTQNRJXulJd9h/zQo= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.3/go.mod h1:0dHuD2HZZSiwfJSy1FO5bX1hQ1TxVV1QXXjpn3XUE44= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9/go.mod h1:AnVH5pvai0pAF4lXRq0bmhbes1u9R8wTE+g+183bZNM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 h1:kG5eQilShqmJbv11XL1VpyDbaEJzWxd4zRiCG30GSn4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.22/go.mod h1:/vNv5Al0bpiF8YdX2Ov6Xy05VTiXsql94yUqJMYaj0w= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88H3UmEcsBoVKq309quMvm3Ds8e9d4eJM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 h1:vFQlirhuM8lLlpI7imKOMsjdQLuN9CPi+k44F/OFVsk= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.16/go.mod h1:62dsXI0BqTIGomDl8Hpm33dv0OntGaVblri3ZRParVQ= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 h1:gGLG7yKaXG02/jBlg210R7VgQIotiQntNhsCFejawx8= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.28.7 h1:49QAdDvSCBfk20XamXFIXfKBMRC81DpV7q/kvJozlro= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.28.7/go.mod h1:cQ05ETcKMluA1/g1/jMQTD/qv9E1WeYCyHmqErEoHBk= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.29.0 h1:MjDK6nt3iDPCk4CVLrc6GoxZIunzRnyIalTYwEUKb/E= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.29.0/go.mod h1:YtA9SsNBWnaDpSECATt8ghAOUMcGeHcnY2kTENLNmO8= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.26.0 h1:tPKUl76gWGmmdewjbAMlbL32hr6roDoE8xLiqKNGPfo= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.26.0/go.mod h1:JJDbUhySZXBEEMEMtiNubwi7ooh7OXI8mb/ItEAShjs= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.21.0 h1:XSDT81zGBjXjREGWkMXX5p6nBd5/wQGZ/OuxTriJ2sE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.21.0/go.mod h1:5k59EsYR4orIPOQrGAKtQjIsM4Yw9qfxMeSs6+/UVN0= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.10 h1:GhWojV+5hJyToD+N0quYvOMb+jd4N5A1d/D3p9kN2Hs= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.10/go.mod h1:+WfxOE027s9M5nE3nNjpfspneBWweSjZ+ywRQLc5+jQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0 h1:NXi4pNJWjAaiI56P1Rl8DC9A4jMNRE00WNBsDua5WRg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0/go.mod h1:L3ZT0N/vBsw77mOAawXmRnREpEjcHd2v5Hzf7AkIH8M= -github.com/aws/aws-sdk-go-v2/service/eks v1.27.12 h1:eKidf2ebtleLtH67x02syhO9t3FItv9a7/ep9KC3TAM= -github.com/aws/aws-sdk-go-v2/service/eks v1.27.12/go.mod h1:ZoyBDE311XYRiJpofw4jorVH2u+UhFpzfkrxF3aWu0U= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.10 h1:gGqHXu9rt/F+xGidPfFKVZUYEDZ3zKMMAOx1yVUr//U= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.10/go.mod h1:pidEyxe4u/vkB8wvbKRZ/r6IUJcyhQoTbSLA2HWR6cY= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.11 h1:IN2XMTLmhIEL5e3o+tY9JsLFSAxmjgM8gI7W2+CPrpw= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.11/go.mod h1:oPHYtcocUcfHOE7qygtvyZMw82nedCKZSop/R9jxlAM= -github.com/aws/aws-sdk-go-v2/service/iam v1.20.0 h1:ywXSXkssdnuPlJyCZVO5kAUQhFm/RhsbvWRHklJ0uH4= -github.com/aws/aws-sdk-go-v2/service/iam v1.20.0/go.mod h1:kAnokExGCYs7zfvZEZdFHvQ/x4ZKIci0Raps6mZI1Ag= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.31.0 h1:71Sptj0YBk/w3Q/7o0BRpTuggS8e8Y9k0zpArf2qW20= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.31.0/go.mod h1:wJGfoc78LfCPzl0VQPdU3wOXgyikdwXZKaV8i3Ot0UM= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.35.0 h1:2wmiMFK1XlNNvc3xDosz2nKotsWac99jJqbYm92gMVc= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.35.0/go.mod h1:EV06EPuSb3m40bD1suX/QSj3o161aG/6Wwbodk2vqzA= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.29.2 h1:S9sfsAGkT/5e0bzqLMK7k3DkoZEz0EioL336dT+sCIM= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.29.2/go.mod h1:N6mA9PPSL2C2drFl+Yx8oEUiuSGhOiplOixRGWc2OYM= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQLXk86DnXQMXgx1omrAGEpF/d68= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.27.2 h1:3rlmecRLKVdb3HuszS+vmNH8iux3MGv+xeaRL+jjXuc= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.27.2/go.mod h1:2DlzmV08HWbh/ND4/tHJ/B4Muhw0xogKppw95DW7yc4= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 h1:3VsdIKjFmyXFkKV21tgn49/dxSziWhjnx3YbqrDofXc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0/go.mod h1:f2AJtWtbonV7cSBVdxfs6e68cponNukbBDvzc4WIASo= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.7 h1:MRBXts9pc/3RdaeLXR4HwmVhqMP70sOEYHpkgmAWDbU= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.7/go.mod h1:Nt5l6Vn68Hv0JWJ6dcQDKuBAKAfHUZSC9Ln8X/1fUMY= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.17.2 h1:apTGiKTGh6WeSj3/Kc3ZfTAzp/PZElJztdfiYkGmz+8= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.17.2/go.mod h1:T7I3S3o4CWa9sSV2DIK+5ZmuMXarrcrE8RYKGDaQ1I4= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.21.6 h1:qIjRTVTFHa/R+k3Cl3ycLjnWYUXhLThmqW3ZbCn6G6o= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.21.6/go.mod h1:/ZlJt5r04rRWDg/7K6cQ6Tq0ZUnUMVR2FRg0GGTy/e0= +github.com/aws/aws-sdk-go-v2/service/iam v1.22.7 h1:hitc48qIZgl38TU33Gxi3V0blniZBDRbdExINJDZ9f8= +github.com/aws/aws-sdk-go-v2/service/iam v1.22.7/go.mod h1:d4c7P+mola/qBIgxgtVHK/w77vn+BlCsC/tbJ3m8m4Y= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 h1:T4pFel53bkHjL2mMo+4DKE6r6AuoZnM0fg7k1/ratr4= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1/go.mod h1:GeUru+8VzrTXV/83XyMJ80KpH8xO89VPoUileyNQ+tc= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3 h1:I0dcwWitE752hVSMrsLCxqNQ+UdEp3nACx2bYNMQq+k= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3/go.mod h1:Seb8KNmD6kVTjwRjVEgOT5hPin6sq+v4C2ycJQDwuH8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3/go.mod h1:wlY6SVjuwvh3TVRpTqdy4I1JpBFLX4UGeKZdWntaocw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 h1:0iKliEXAcCa2qVtRs7Ot5hItA2MsufrphbRFlz1Owxo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3 h1:BKjwCJPnANbkwQ8vzSbaZDKawwagDubrH/z/c0X+kbQ= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2IaN6rZ+Op7zX+bOUMdL4fsrYZiD0dsjLhNKwZc= github.com/aws/aws-sdk-go-v2/service/kms v1.16.3/go.mod h1:QuiHPBqlOFCi4LqdSskYYAWpQlx3PKmohy+rE2F+o5g= -github.com/aws/aws-sdk-go-v2/service/kms v1.22.0 h1:WV+lMUfzkW0k2gVci1oKLC1sFGqxZleRl56Df9T3+Vk= -github.com/aws/aws-sdk-go-v2/service/kms v1.22.0/go.mod h1:EEfb4gfSphdVpRo5sGf2W3KvJbelYUno5VaXR5MJ3z4= -github.com/aws/aws-sdk-go-v2/service/outposts v1.27.10 h1:dYviIm+qsyVZwKHh7fKK1XYHHZc9SXdI7jYOWAVUXj8= -github.com/aws/aws-sdk-go-v2/service/outposts v1.27.10/go.mod h1:672oFsPewdh6XOTh/qE3BPhO1UwdAVLLMIOkHNYbGDw= +github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 h1:uRGw0UKo5hc7M2T7uGsK/Yg2qwecq/dnVjQbbq9RCzY= +github.com/aws/aws-sdk-go-v2/service/kms v1.24.7/go.mod h1:z3O9CXfVrKAV3c9fMWOUUv2C6N2ggXCDHeXpOB6lAEk= +github.com/aws/aws-sdk-go-v2/service/outposts v1.30.2 h1:h5Vhumey2W7PgBIUq8rdjbCEGhejHxRg3h3ghy+LJuA= +github.com/aws/aws-sdk-go-v2/service/outposts v1.30.2/go.mod h1:z5VgSa4uuoa8CdR31M27V1pf0rwELAOtKMMzFGMKnlg= +github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0 h1:RQOMvPwte2H4ZqsiZmrla1crhBWDFnW8bZynkec5cGU= +github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0/go.mod h1:LJyh9figH3ZpSiVjR5umzbl6V3EpQdZR4Se1ayoUtfI= github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3 h1:rMPtwA7zzkSQZhhz9U3/SoIDz/NZ7Q+iRn4EIO8rSyU= github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3/go.mod h1:g1qvDuRsJY+XghsV6zg00Z4KJ7DtFFCx8fJD2a491Ak= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4/go.mod h1:PJc8s+lxyU8rrre0/4a0pn2wgwiDvOEzoOjcJUBr67o= github.com/aws/aws-sdk-go-v2/service/sns v1.17.4/go.mod h1:kElt+uCcXxcqFyc+bQqZPFD9DME/eC6oHBXvFzQ9Bcw= github.com/aws/aws-sdk-go-v2/service/sqs v1.18.3/go.mod h1:skmQo0UPvsjsuYYSYMVmrPc1HWCbHUJyrCEp+ZaLzqM= github.com/aws/aws-sdk-go-v2/service/ssm v1.24.1/go.mod h1:NR/xoKjdbRJ+qx0pMR4mI+N/H1I1ynHwXnO6FowXJc0= -github.com/aws/aws-sdk-go-v2/service/ssm v1.36.4 h1:3AjvCuRS8OnNVRC/UBagp1Jo2feR94+VAIKO4lz8gOQ= -github.com/aws/aws-sdk-go-v2/service/ssm v1.36.4/go.mod h1:p6MaesK9061w6NTiFmZpUzEkKUY5blKlwD2zYyErxKA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.11.3/go.mod h1:7UQ/e69kU7LDPtY40OyoHYgRmgfGM4mgsLYtcObdveU= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 h1:UBQjaMTCKwyUYwiVnUt6toEJwGXsLBI6al083tpjJzY= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 h1:PkHIIJs8qvq0e5QybnZoG1K/9QTrLr9OsqCIo59jOBA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.16.3/go.mod h1:bfBj0iVmsUyUg4weDB4NxktD9rDGeKSVWnjTnwbx9b8= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 h1:2DQLAKDteoEDI8zpCzqBMaZlJuoE9iTYD0gFmXVax9E= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= -github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= -github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/awslabs/goformation/v4 v4.15.5/go.mod h1:wB5lKZf1J0MYH1Lt4B9w3opqz0uIjP7MMCAcib3QkwA= github.com/awslabs/goformation/v4 v4.19.5 h1:Y+Tzh01tWg8gf//AgGKUamaja7Wx9NPiJf1FpZu4/iU= github.com/awslabs/goformation/v4 v4.19.5/go.mod h1:JoNpnVCBOUtEz9bFxc9sjy8uBUCLF5c4D1L7RhRTVM8= -github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= -github.com/aymanbagabas/go-osc52 v1.0.3 h1:DTwqENW7X9arYimJrPeGZcV0ln14sGMt3pHZspWD+Mg= github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benjamintf1/unmarshalledmatchers v1.0.0 h1:JUhctHQVNarMXg5x3m0Tkp7WnDLzNVxeWc1qbKQPylI= @@ -389,12 +354,10 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= -github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= +github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJY= +github.com/bkielbasa/cyclop v1.2.1/go.mod h1:K/dT/M0FPAiYjBgQGau7tz+3TMh4FWAEqlMhzFWCrgM= github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb h1:m935MPodAbYS46DG4pJSv7WO+VECIWUQ7OJYSoTrMh4= github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= @@ -403,22 +366,23 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= -github.com/bombsimon/wsl/v3 v3.3.0 h1:Mka/+kRLoQJq7g2rggtgQsjuI/K5Efd87WX96EWFxjM= -github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/breml/bidichk v0.2.3 h1:qe6ggxpTfA8E75hdjWPZ581sY3a2lnl0IRxLQFelECI= -github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A= -github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1xw= -github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU= +github.com/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU= +github.com/bombsimon/wsl/v3 v3.4.0/go.mod h1:KkIB+TXkqy6MvK9BDZVbZxKNYsE1/oLRJbIFtf14qqo= +github.com/breml/bidichk v0.2.4 h1:i3yedFWWQ7YzjdZJHnPo9d/xURinSq3OM+gyM43K4/8= +github.com/breml/bidichk v0.2.4/go.mod h1:7Zk0kRFt1LIZxtQdl9W9JwGAcLTTkOs+tN7wuEYGJ3s= +github.com/breml/errchkjson v0.3.1 h1:hlIeXuspTyt8Y/UmP5qy1JocGNR00KQHgfaNtRAjoxQ= +github.com/breml/errchkjson v0.3.1/go.mod h1:XroxrzKjdiutFyW3nWhw34VGg7kiMsDQox73yWCGI2U= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= -github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= -github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= +github.com/butuzov/ireturn v0.2.0 h1:kCHi+YzC150GE98WFuZQu9yrTn6GEydO2AuPLbTgnO4= +github.com/butuzov/ireturn v0.2.0/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= +github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI= +github.com/butuzov/mirror v1.1.0/go.mod h1:8Q0BdQU6rC6WILDiBM60DBfvV78OLJmMmixe7GF45AE= github.com/bxcodec/faker v2.0.1+incompatible h1:P0KUpUw5w6WJXwrPfv35oc91i4d8nf40Nwln+M/+faA= github.com/bxcodec/faker v2.0.1+incompatible/go.mod h1:BNzfpVdTwnFJ6GtfYTcQu6l6rHShT+veBxNCnjCx5XM= -github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= github.com/caarlos0/ctrlc v1.2.0 h1:AtbThhmbeYx1WW3WXdWrd94EHKi+0NPRGS4/4pzrjwk= github.com/caarlos0/ctrlc v1.2.0/go.mod h1:n3gDlSjsXZ7rbD9/RprIR040b7oaLfNStikPd4gFago= github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II= @@ -433,127 +397,96 @@ github.com/caarlos0/log v0.1.6/go.mod h1:BCSXWwgm3+stBxIPx09on4ydlPFhvrCZdo/IX1s github.com/caarlos0/sshmarshal v0.0.0-20220308164159-9ddb9f83c6b3 h1:w2ANoiT4ubmh4Nssa3/QW1M7lj3FZkma8f8V5aBDxXM= github.com/caarlos0/testfs v0.4.4 h1:3PHvzHi5Lt+g332CiShwS8ogTgS3HjrmzZxCm6JCDr8= github.com/caarlos0/testfs v0.4.4/go.mod h1:bRN55zgG4XCUVVHZCeU+/Tz1Q6AxEJOEJTliBy+1DMk= -github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= github.com/cavaliergopher/cpio v1.0.1 h1:KQFSeKmZhv0cr+kawA3a0xTQCU4QxXF1vhU7P7av2KM= github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI16PX4xejRQc= +github.com/ccojocar/zxcvbn-go v1.0.1 h1:+sxrANSCj6CdadkcMnvde/GWU1vZiiXRbqYSCalV4/4= +github.com/ccojocar/zxcvbn-go v1.0.1/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60= github.com/cenk/backoff v2.2.1+incompatible h1:djdFT7f4gF2ttuzRKPbMOWgZajgesItGLwG5FTQKmmE= github.com/cenk/backoff v2.2.1+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c= github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV47EEXL8mWmRdEfGscSJ+7EgePNgt0s= -github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8= -github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk= -github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= -github.com/charmbracelet/bubbles v0.13.0 h1:zP/ROH3wJEBqZWKIsD50ZKKlx3ydLInq3LdD/Nrlb8w= -github.com/charmbracelet/bubbles v0.13.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc= -github.com/charmbracelet/bubbletea v0.21.0 h1:f3y+kanzgev5PA916qxmDybSHU3N804uOnKnhRPXTcI= -github.com/charmbracelet/bubbletea v0.21.0/go.mod h1:GgmJMec61d08zXsOhqRC/AiOx4K4pmz+VIcRIm1FKr4= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= +github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= +github.com/charithe/durationcheck v0.0.10 h1:wgw73BiocdBDQPik+zcEoBG/ob8uyBHf2iyoHGPf5w4= +github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoGOY1C1L6uouGNreQ= +github.com/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI= +github.com/charmbracelet/bubbles v0.15.0/go.mod h1:Y7gSFbBzlMpUDR/XM9MhZI374Q+1p1kluf1uLl8iK74= +github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU= +github.com/charmbracelet/bubbletea v0.24.1 h1:LpdYfnu+Qc6XtvMz6d/6rRY71yttHTP5HtrjMgWvixc= +github.com/charmbracelet/bubbletea v0.24.1/go.mod h1:rK3g/2+T8vOSEkNHvtq40umJpeVYDn6bLaqbgzhL/hg= github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= github.com/charmbracelet/keygen v0.3.0 h1:mXpsQcH7DDlST5TddmXNXjS0L7ECk4/kLQYyBcsan2Y= -github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs= -github.com/charmbracelet/lipgloss v0.6.1-0.20220911181249-6304a734e792 h1:VfX981snWr7d4yvFAJYCN3S2sOsweiM6BsqZgFPY65c= -github.com/charmbracelet/lipgloss v0.6.1-0.20220911181249-6304a734e792/go.mod h1:sOPE4igPEyZ5Q75T0PYIMqA40cL+r0NrLlMJxr01aiE= -github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 h1:E7LT642ysztPWE0dfz43cWOvMiF42DyTRC+eZIaO4yI= -github.com/chavacava/garif v0.0.0-20220630083739-93517212f375/go.mod h1:4m1Rv7xfuwWPNKXlThldNuJvutYM6J95wNuuVmn55To= +github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk= +github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E= +github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c= +github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0= +github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo= +github.com/chigopher/pathlib v0.15.0 h1:1pg96WL3iC1/YyWV4UJSl3E0GBf4B+h5amBtsbAAieY= +github.com/chigopher/pathlib v0.15.0/go.mod h1:3+YPPV21mU9vyw8Mjp+F33CyCfE6iOzinpiqBcccv7I= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= -github.com/cloudflare/cfssl v1.6.3 h1:hDhRaGQN55nh0510/7A5QBN3xLoDz/M7nQX80icXvzs= -github.com/cloudflare/cfssl v1.6.3/go.mod h1:Kq0iHKY8sm2klDeQ2Ci/FI+6QdBGuyPWodgTJFLrXIw= -github.com/cloudflare/redoctober v0.0.0-20201013214028-99c99a8e7544/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= +github.com/cloudflare/cfssl v1.6.4 h1:NMOvfrEjFfC63K3SGXgAnFdsgkmiq4kATme5BfcqrO8= +github.com/cloudflare/cfssl v1.6.4/go.mod h1:8b3CQMxfWPAeom3zBnGJ6sd+G1NkL5TXqmDXacb+1J0= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210322005330-6414d713912e/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211216145620-d92e9ce0af51 h1:F6fR7MjvOIk+FLQOeBCAbbKItVgbdj0l9VWPiHeBEiY= -github.com/cncf/xds/go v0.0.0-20211216145620-d92e9ce0af51/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcKDqs= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns= github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw= -github.com/containerd/stargz-snapshotter/estargz v0.12.0 h1:idtwRTLjk2erqiYhPWy2L844By8NRFYEwYHcXhoIWPM= -github.com/containerd/stargz-snapshotter/estargz v0.12.0/go.mod h1:AIQ59TewBFJ4GOPEQXujcrJ/EKxh5xXZegW1rkR1P/M= +github.com/containerd/stargz-snapshotter/estargz v0.12.1 h1:+7nYmHJb0tEkcRaAW+MHqoKaJYZmkikupxCqVtmPuY0= +github.com/containerd/stargz-snapshotter/estargz v0.12.1/go.mod h1:12VUuCq3qPq4y8yUW+l5w3+oXV3cx2Po3KSe/SmPGqw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/daixiang0/gci v0.8.1 h1:T4xpSC+hmsi4CSyuYfIJdMZAr9o7xZmHpQVygMghGZ4= -github.com/daixiang0/gci v0.8.1/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= -github.com/dave/dst v0.27.1 h1:TO1Jlnfvkxj5OrJTqUexWBQKVhim8PfefUDOH0yrLUw= -github.com/dave/dst v0.27.1/go.mod h1:eF/UOVnw9Ech3NkZFCdtujtISJFRYf11+I93p+RI5S4= -github.com/dave/jennifer v1.6.1 h1:T4T/67t6RAA5AIV6+NP8Uk/BIsXgDoqEowgycdQQLuk= -github.com/dave/jennifer v1.6.1/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/daixiang0/gci v0.11.0 h1:XeQbFKkCRxvVyn06EOuNY6LPGBLVuB/W130c8FrnX6A= +github.com/daixiang0/gci v0.11.0/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= +github.com/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY= +github.com/dave/dst v0.27.3/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc= +github.com/dave/jennifer v1.7.0 h1:uRbSBH9UTS64yXbh4FrMHfgfY762RD+C7bUPKODpSJE= +github.com/dave/jennifer v1.7.0/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= @@ -582,7 +515,6 @@ github.com/dlespiau/kube-test-harness v0.0.0-20200915102055-a03579200ae8/go.mod github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v20.10.21+incompatible h1:qVkgyYUnOLQ98LtXBrwd/duVqPT2X4SHndOuGsfwyhU= github.com/docker/cli v20.10.21+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= @@ -594,25 +526,21 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f h1:8GDPb0tCY8LQ+OJ3dbHb5sA6YZWXFORQYZx5sdsTlMs= -github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= +github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -621,29 +549,20 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ= -github.com/envoyproxy/protoc-gen-validate v0.6.2 h1:JiO+kJTpmYGjEodY7O1Zk8oZcNz1+f30UtwtXoFUPzE= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= -github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE= github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/evertras/bubble-table v0.14.4 h1:UHUiPfsJ+lqbPSHIM1n7O8Ie2tbK0r9ReicXFnLg44I= -github.com/evertras/bubble-table v0.14.4/go.mod h1:SPOZKbIpyYWPHBNki3fyNpiPBQkvkULAtOT7NTD5fKY= +github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0nW9SYGc= +github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evertras/bubble-table v0.15.2 h1:hVj27V9tk5TD5p6mVv0RK/KJu2sHq0U+mBMux/HptkU= +github.com/evertras/bubble-table v0.15.2/go.mod h1:SPOZKbIpyYWPHBNki3fyNpiPBQkvkULAtOT7NTD5fKY= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -652,35 +571,23 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= -github.com/fullstorydev/grpcurl v1.8.1 h1:Pp648wlTTg3OKySeqxM5pzh8XF6vLqrm8wRq66+5Xo0= -github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= -github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= @@ -689,8 +596,8 @@ github.com/github-release/github-release v0.10.0 h1:nJ3oEV2JrC0brYi6B8CsXumn/ORF github.com/github-release/github-release v0.10.0/go.mod h1:CcaWgA5VoBGz94mOHYIXavqUA8kADNZxU+5/oDQxF6o= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-critic/go-critic v0.6.5 h1:fDaR/5GWURljXwF8Eh31T2GZNz9X4jeboS912mWF8Uo= -github.com/go-critic/go-critic v0.6.5/go.mod h1:ezfP/Lh7MA6dBNn4c6ab5ALv3sKnZVLx37tr00uuaOY= +github.com/go-critic/go-critic v0.9.0 h1:Pmys9qvU3pSML/3GEQ2Xd9RZ/ip+aXHKILuxczKGV/U= +github.com/go-critic/go-critic v0.9.0/go.mod h1:5P8tdXL7m/6qnyG6oRAlYLORvoXH0WDypYgAEmagT40= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -712,7 +619,6 @@ github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -722,9 +628,9 @@ github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -740,12 +646,8 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -754,26 +656,25 @@ github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible h1:2cauKuaEL github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM= github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho= github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.2 h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0= -github.com/go-toolsmith/astcopy v1.0.2/go.mod h1:4TcEdbElGc9twQEYpVo/aieIXfHhiuLh4aLAck6dO7Y= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.2/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= -github.com/go-toolsmith/astequal v1.0.3 h1:+LVdyRatFS+XO78SGV4I3TCEA0AC7fKEGma+fH+674o= +github.com/go-toolsmith/astcast v1.1.0 h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8= +github.com/go-toolsmith/astcast v1.1.0/go.mod h1:qdcuFWeGGS2xX5bLM/c3U9lewg7+Zu4mr+xPwZIB4ZU= +github.com/go-toolsmith/astcopy v1.1.0 h1:YGwBN0WM+ekI/6SS6+52zLDEf8Yvp3n2seZITCUBt5s= +github.com/go-toolsmith/astcopy v1.1.0/go.mod h1:hXM6gan18VA1T/daUEHCFcYiW8Ai1tIwIzHY6srfEAw= github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= -github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5 h1:eD9POs68PHkwrx7hAB78z1cb6PfGq/jyWn3wJywsH1o= -github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5/go.mod h1:3NAwwmD4uY/yggRxoEjk/S00MIV3A+H7rrE3i87eYxM= -github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= +github.com/go-toolsmith/astequal v1.1.0 h1:kHKm1AWqClYn15R0K1KKE4RG614D46n+nqUQ06E1dTw= +github.com/go-toolsmith/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ= +github.com/go-toolsmith/astfmt v1.1.0 h1:iJVPDPp6/7AaeLJEruMsBUlOYCmvg0MoCfJprsOmcco= +github.com/go-toolsmith/astfmt v1.1.0/go.mod h1:OrcLlRwu0CuiIBp/8b5PYF9ktGVZUjlNMV634mhwuQ4= +github.com/go-toolsmith/astp v1.1.0 h1:dXPuCl6u2llURjdPLLDxJeZInAeZ0/eZwFJmqZMnpQA= +github.com/go-toolsmith/astp v1.1.0/go.mod h1:0T1xFGz9hicKs8Z5MfAqSUitoUYS30pDMsRVIDHs8CA= +github.com/go-toolsmith/pkgload v1.2.2 h1:0CtmHq/02QhxcF7E9N5LIFcYFsMR5rdovfqTtRKkgIk= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= -github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQiyP2Bvw= +github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ= +github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus= +github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig= +github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U= +github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU= github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs= github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0= @@ -785,18 +686,13 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= @@ -806,9 +702,6 @@ github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -823,7 +716,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -844,7 +736,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -856,32 +747,29 @@ github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6 github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY= github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs= -github.com/golangci/golangci-lint v1.50.1 h1:C829clMcZXEORakZlwpk7M4iDw2XiwxxKaG504SZ9zY= -github.com/golangci/golangci-lint v1.50.1/go.mod h1:AQjHBopYS//oB8xs0y0M/dtxdKHkdhl0RvmjUct0/4w= +github.com/golangci/golangci-lint v1.54.2 h1:oR9zxfWYxt7hFqk6+fw6Enr+E7F0SN2nqHhJYyIb0yo= +github.com/golangci/golangci-lint v1.54.2/go.mod h1:vnsaCTPKCI2wreL9tv7RkHDwUrz3htLjed6+6UsvcwU= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g= +github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= -github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 h1:oKYOfNR7Hp6XpZ4JqolL5u642Js5Z0n7psPVl+S5heo= github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= +github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 h1:EcQR3gusLHN46TAD+G+EbaaqJArt5vHhNpXAa12PQf4= +github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= -github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/certificate-transparency-go v1.1.2-0.20210422104406-9f33727a7a18/go.mod h1:6CKh9dscIRoqc2kC6YUFICHZMT9NrClyPrRVFrdw1QQ= -github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 h1:806qveZBQtRNHroYHyg6yrsjqBJh9kIB4nfmB8uJnak= -github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92/go.mod h1:kXWPsHVPSKVuxPPG69BRtumCbAW537FydV/GH89oBhM= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= +github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/certificate-transparency-go v1.1.4 h1:hCyXHDbtqlr/lMXU0D4WgbalXL0Zk4dSWWMbPV8VrqY= +github.com/google/certificate-transparency-go v1.1.4/go.mod h1:D6lvbfwckhNrbM9WVl1EVeMOyzC19mpIjMOI4nxBHtQ= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= @@ -901,26 +789,20 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.11.0 h1:Xt8x1adcREjFcmDoDK8OdOsjxu90PHkGuwNP8GiHMLM= -github.com/google/go-containerregistry v0.11.0/go.mod h1:BBaYtsHPHA42uEgAvd/NejvAfPSlz281sJWqupjSxfk= -github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= +github.com/google/go-containerregistry v0.12.1 h1:W1mzdNUTx4Zla4JaixCRLhORcR7G6KxE5hHl5fkPsp8= +github.com/google/go-containerregistry v0.12.1/go.mod h1:sdIK+oHQO7B93xI8UweYdl887YhuIwg9vz8BSLH3+8k= github.com/google/go-github/v47 v47.1.0 h1:Cacm/WxQBOa9lF0FT0EMjZ2BWMetQ1TQfyurn4yF1z8= github.com/google/go-github/v47 v47.1.0/go.mod h1:VPZBXNbFSJGjyjFRUKo9vZGawTajnWzC/YjGw/oFKi0= -github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= github.com/google/go-replayers/grpcreplay v1.1.0 h1:S5+I3zYyZ+GQz68OfbURDdt/+cSMqCK1wrvNx7WBzTE= github.com/google/go-replayers/grpcreplay v1.1.0/go.mod h1:qzAvJ8/wi57zq7gWqaE6AwLM6miiXUQwP1S+I9icmhk= -github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= github.com/google/go-replayers/httpreplay v1.1.1 h1:H91sIMlt1NZzN7R+/ASswyouLJfW0WLW7fhyUFvDEkY= github.com/google/go-replayers/httpreplay v1.1.1/go.mod h1:gN9GeLIs7l6NUoVaSSnv2RiqK1NiwAmD0MrKeC9IIks= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -941,78 +823,61 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210506205249-923b5ab0fc1a/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230508170847-c6d6667b8fd4 h1:lDSjtNcB7iSo7VVZpLrYJ0ejDahUiLoAINoArL5W+r0= -github.com/google/pprof v0.0.0-20230508170847-c6d6667b8fd4/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= +github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ= +github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/google/trillian v1.3.14-0.20210409160123-c5ea3abd4a41/go.mod h1:1dPv0CUjNQVFEDuAUFhZql16pw/VlPgaX8qj+g5pVzQ= -github.com/google/trillian v1.3.14-0.20210428093031-b4ddea2e86b1/go.mod h1:FdIJX+NoDk/dIN2ZxTyz5nAJWgf+NSSSriPAMThChTY= -github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= -github.com/googleapis/enterprise-certificate-proxy v0.2.1 h1:RY7tHKZcRlk788d5WSo/e83gOyyy742E8GSs771ySpg= -github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ= +github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gophercloud/gophercloud v1.0.0 h1:9nTGx0jizmHxDobe4mck89FyQHVyA3CaXLIUSGJjP9k= -github.com/gophercloud/gophercloud v1.0.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c= +github.com/gophercloud/gophercloud v1.1.1 h1:MuGyqbSxiuVBqkPZ3+Nhbytk1xZxhmfCB2Rg1cJWFWM= +github.com/gophercloud/gophercloud v1.1.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U= -github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= +github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8= +github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= github.com/goreleaser/chglog v0.4.2 h1:afmbT1d7lX/q+GF8wv3a1Dofs2j/Y9YkiCpGemWR6mI= github.com/goreleaser/chglog v0.4.2/go.mod h1:u/F03un4hMCQrp65qSWCkkC6T+G7YLKZ+AM2mITE47s= github.com/goreleaser/fileglob v1.3.0 h1:/X6J7U8lbDpQtBvGcwwPS6OpzkNVlVEsFUVRx9+k+7I= github.com/goreleaser/fileglob v1.3.0/go.mod h1:Jx6BoXv3mbYkEzwm9THo7xbr5egkAraxkGorbJb4RxU= -github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= github.com/goreleaser/goreleaser v1.11.5 h1:b4OReinilkNM28t8DIJncnzPzqnHCAemzux0TABL+TU= github.com/goreleaser/goreleaser v1.11.5/go.mod h1:J+nqBKEUTeKnX8v5RmMTu8Up+ZHHKGM//PZEEaavLc4= -github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= github.com/goreleaser/nfpm/v2 v2.30.1 h1:mn3nrLRvCRW/SO86z2IBTctU6BZSXKkyRR8Zkpw344Y= github.com/goreleaser/nfpm/v2 v2.30.1/go.mod h1:2zdXNdSziz4veeXBVIcLE5Y8oiycm6BOSfflz2UhWGk= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= -github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q= github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= @@ -1028,25 +893,13 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.2/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.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= github.com/hanwen/go-fuse/v2 v2.1.0/go.mod h1:oRyA5eK+pvJyv5otpO/DgccS8y/RvYMaO00GgRLGryc= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -1055,9 +908,8 @@ github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= -github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -1065,10 +917,9 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM= -github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= +github.com/hashicorp/go-plugin v1.4.5 h1:oTE/oQR4eghggRg8VY7PAz3dr++VwDNBGCcOfIvHpBo= +github.com/hashicorp/go-plugin v1.4.5/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= @@ -1089,7 +940,6 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -1104,8 +954,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU= -github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E= +github.com/hashicorp/vault/api v1.8.2 h1:C7OL9YtOtwQbTKI9ogB0A1wffRbCN+rH/LLCHO3d8HM= +github.com/hashicorp/vault/api v1.8.2/go.mod h1:ML8aYzBIhY5m1MD1B2Q0JV89cC85YVH4t5kBaZiyVaE= github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs= github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= @@ -1113,24 +963,19 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= -github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -1140,7 +985,6 @@ github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy770So= github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= @@ -1181,45 +1025,34 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jarcoal/httpmock v1.2.0 h1:gSvTxxFR/MEMfsGrvRbdfpRUMBStovlSRLw0Ep1bwwc= 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/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= -github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= -github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= -github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jhump/protoreflect v1.12.0 h1:1NQ4FpWMgn3by/n1X0fbeKEUxP1wBt7+Oitpv01HR10= github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1229,7 +1062,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= @@ -1240,26 +1072,22 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/rest v0.0.0-20210106114233-22cd0577e450 h1:Lr2sEj5wWzk82b/L8LsLzsCxywQaOpcr0ti/qcfzCOk= github.com/kevinburke/rest v0.0.0-20210106114233-22cd0577e450/go.mod h1:pD+iEcdAGVXld5foVN4e24zb/6fnb60tgZPZ3P/3T/I= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v1.1.0 h1:pH/t1WS9NzT8go394IqZeJTMHVm6Cr6ZJ6AQ+mdNo/o= github.com/kevinburke/ssh_config v1.1.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c= -github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= +github.com/kisielk/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8= +github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= -github.com/kisom/goutils v1.4.3/go.mod h1:Lp5qrquG7yhYnWzZCI/68Pa/GpFynw//od6EkGnWpac= -github.com/kkHAIKE/contextcheck v1.1.3 h1:l4pNvrb8JSwRd51ojtcOxOeHJzHek+MtOyXbaR0uvmw= -github.com/kkHAIKE/contextcheck v1.1.3/go.mod h1:PG/cwd6c0705/LM0KTr1acO2gORUxkSVWyLJOFW5qoo= +github.com/kkHAIKE/contextcheck v1.1.4 h1:B6zAaLhOEEcjvUgIYEqystmnFk1Oemn8bvJhbt0GMb8= +github.com/kkHAIKE/contextcheck v1.1.4/go.mod h1:1+i/gWqokIa+dm31mqGLZhZJ7Uh44DJGZVmr6QRBNJg= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.7/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1290,125 +1118,107 @@ github.com/kubicorn/kubicorn v0.0.0-20180829191017-06f6bce92acc h1:7jGjX/rZDjpMw github.com/kubicorn/kubicorn v0.0.0-20180829191017-06f6bce92acc/go.mod h1:Z/PU7XQicaZV6QFTAvm8EaWyfNbAb4a76kmR4Am4KA8= github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs= github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= -github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g= -github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= -github.com/kylelemons/go-gypsy v1.0.0/go.mod h1:chkXM0zjdpXOiqkCW1XcCHDfjfk14PH2KKkQWxfJUcU= +github.com/kunwardeep/paralleltest v1.0.8 h1:Ul2KsqtzFxTlSU7IP0JusWlLiNqQaloB9vguyjbE558= +github.com/kunwardeep/paralleltest v1.0.8/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= -github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= +github.com/kyoh86/exportloopref v0.1.11 h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ= +github.com/kyoh86/exportloopref v0.1.11/go.mod h1:qkV4UF1zGl6EkF1ox8L5t9SwyeBAZ3qLMd6up458uqA= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA= github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= -github.com/ldez/tagliatelle v0.3.1 h1:3BqVVlReVUZwafJUwQ+oxbx2BEX2vUG4Yu/NOfMiKiM= -github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= +github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo= +github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/leonklingele/grouper v1.1.0 h1:tC2y/ygPbMFSBOs3DcyaEMKnnwH7eYKzohOtRrf0SAg= -github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= -github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= +github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= +github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= -github.com/lyft/protoc-gen-star v0.5.1/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= 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/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI= github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE= -github.com/maratori/testpackage v1.1.0 h1:GJY4wlzQhuBusMF1oahQCBtUV/AQ/k69IZ68vxaac2Q= -github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc= +github.com/maratori/testpackage v1.1.1 h1:S58XVV5AD7HADMmD0fNnziNHqKvSdDuEKdPD1rNTU04= +github.com/maratori/testpackage v1.1.1/go.mod h1:s4gRK/ym6AMrqpOa/kEbQTV4Q4jb7WeLZzVhVVVOQMc= github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY= github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 h1:gWg6ZQ4JhDfJPqlo2srm/LN17lpybq15AryXIRcWYLE= +github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= 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= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= +github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-oci8 v0.1.1/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1 h1:9XE5ykDiC8eNSqIPkxx0EsV3kMX1oe4kQWRZjIgytUA= -github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1/go.mod h1:qbKwBR+qQODzH2WD/s53mdgp/xVcXMlJb59GRFOp6Z4= +github.com/maxbrunsfeld/counterfeiter/v6 v6.6.2 h1:CEy7VRV/Vbm7YLuZo3pGKa5GlPX4zzric6dEubIJTx0= +github.com/maxbrunsfeld/counterfeiter/v6 v6.6.2/go.mod h1:otjOyjeqm3LALYcmX2AQIGH0VlojDoSd8aGOzsHAnBc= github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mgechev/revive v1.2.4 h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI= -github.com/mgechev/revive v1.2.4/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mgechev/revive v1.3.2 h1:Wb8NQKBaALBJ3xrrj4zpwJwqwNA6nDpyJSEQWcCka6U= +github.com/mgechev/revive v1.3.2/go.mod h1:UCLtc7o5vg5aXCwdUTU1kEBQ1v+YXPAkYDIDXbrs5I0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= @@ -1417,7 +1227,6 @@ github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HK github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= @@ -1432,7 +1241,6 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/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= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mmarkdown/mmark v2.0.40+incompatible h1:vMeUeDzBK3H+/mU0oMVfMuhSXJlIA+DE/DMPQNAj5C4= @@ -1442,9 +1250,6 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= -github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= -github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1455,18 +1260,16 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= -github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= -github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= +github.com/moricho/tparallel v0.3.1 h1:fQKD4U1wRMAYNngDonW5XupoB/ZGJHdpzrWqgyg9krA= +github.com/moricho/tparallel v0.3.1/go.mod h1:leENX2cUv7Sv2qDgdi0D0fCftN8fRC67Bcn8pqzeYNI= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= -github.com/muesli/cancelreader v0.2.0 h1:SOpr+CfyVNce341kKqvbhhzQhBPyJRXQaCtn03Pae1Q= -github.com/muesli/cancelreader v0.2.0/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= +github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/muesli/mango v0.1.0 h1:DZQK45d2gGbql1arsYA4vfg4d7I9Hfx5rX/GCmzsAvI= github.com/muesli/mango v0.1.0/go.mod h1:5XFpbC8jY5UUv89YQciiXNlbi+iJgt29VDC5xbzrLL4= github.com/muesli/mango-cobra v1.2.0 h1:DQvjzAM0PMZr85Iv9LIMaYISpTOliMEg+uMFtNbYvWg= @@ -1479,116 +1282,86 @@ github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKt github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8= github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= -github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= -github.com/muesli/termenv v0.12.1-0.20220901123159-d729275e0977 h1:Y0zb7SdTvzR44kY+Ybemf3Nu/tRW3CDJixgZD9/Y24I= -github.com/muesli/termenv v0.12.1-0.20220901123159-d729275e0977/go.mod h1:bN6sPNtkiahdhHv2Xm6RGU16LSCxfbIZvMfqjOCfrR4= +github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc= +github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs= +github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= -github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/nelsam/hel/v2 v2.3.2/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= github.com/nelsam/hel/v2 v2.3.3/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.8.3 h1:pw5O09vwg8ZaditDp/nQRqVnrMczSJDxRDJMowvhsrM= -github.com/nishanths/exhaustive v0.8.3/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/nishanths/exhaustive v0.11.0 h1:T3I8nUGhl/Cwu5Z2hfc92l0e04D2GEW6e0l8pzda2l0= +github.com/nishanths/exhaustive v0.11.0/go.mod h1:RqwDsZ1xY0dNdqHho2z6X+bgzizwbLYOWnZbbl2wLB4= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= +github.com/nunnatsa/ginkgolinter v0.13.5 h1:fOsPB4CEZOPkyMqF4B9hoqOpooFWU7vWSVkCSscVpgU= +github.com/nunnatsa/ginkgolinter v0.13.5/go.mod h1:OBHy4536xtuX3102NM63XRtOyxqZOO02chsaeDWXVO8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 h1:Yl0tPBa8QPjGmesFh1D0rDy+q1Twx6FyU7VWHi8wZbI= github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852/go.mod h1:eqOVx5Vwu4gd2mmMZvVZsgIqNSaW3xxRThUJ0k/TPk4= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs= -github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= +github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= +github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= -github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c= +github.com/onsi/gomega v1.28.0/go.mod h1:A1H2JE76sI14WIP57LMKj7FVfCHx3g3BcZVjJG8bjX8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8= github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY= github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/copy v1.9.0 h1:7KFNiCgZ91Ru4qW4CWPf/7jqtxLagGRmIxWldPP9VY4= -github.com/otiai10/copy v1.9.0/go.mod h1:hsfX19wcn0UWIHUQ3/4fHuehhk2UyArQ9dVFAn3FczI= +github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= +github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/otiai10/mint v1.4.0 h1:umwcf7gbpEwf7WFzqmWwSv0CzbeMsae2u9ZvpP8j2q4= -github.com/otiai10/mint v1.4.0/go.mod h1:gifjb2MYOoULtKLqUAEILUG/9KONW6f7YsJ6vQLTlFI= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= +github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= @@ -1597,143 +1370,121 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/sftp v1.13.5 h1:a3RLUqkyjYRtBTZJZ1VRrKbN3zhuPLlUc3sphVz81go= github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfxg= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.0.5 h1:AHB5JRCjlmelh9RrLxT9sgzpalIwwq4hqE8EkwIwKdY= -github.com/polyfloyd/go-errorlint v1.0.5/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/polyfloyd/go-errorlint v1.4.4 h1:A9gytp+p6TYqeALTYRoxJESYP8wJRETRX2xzGWFsEBU= +github.com/polyfloyd/go-errorlint v1.4.4/go.mod h1:ry5NqF7l9Q77V+XqAfUg1zfryrEtyac3G5+WVpIK0xU= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU= github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.24.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= -github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= -github.com/quasilyte/go-ruleguard v0.3.18 h1:sd+abO1PEI9fkYennwzHn9kl3nqP6M5vE7FiOzZ+5CE= -github.com/quasilyte/go-ruleguard v0.3.18/go.mod h1:lOIzcYlgxrQ2sGJ735EHXmf/e9MJ516j16K/Ifcttvs= -github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= -github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f h1:6Gtn2i04RD0gVyYf2/IUMTIs+qYleBt4zxDqkLTcu4U= -github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= +github.com/quasilyte/go-ruleguard v0.4.0 h1:DyM6r+TKL+xbKB4Nm7Afd1IQh9kEUKQs2pboWGKtvQo= +github.com/quasilyte/go-ruleguard v0.4.0/go.mod h1:Eu76Z/R8IXtViWUIHkE3p8gdH3/PKk1eh3YGfaEof10= +github.com/quasilyte/gogrep v0.5.0 h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo= +github.com/quasilyte/gogrep v0.5.0/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= +github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 h1:TCg2WBOl980XxGFEZSS6KlBGIV0diGdySzxATTWoqaU= +github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs= github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= +github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/rubenv/sql-migrate v1.3.1 h1:Vx+n4Du8X8VTYuXbhNxdEUoh6wiJERA0GlWocR5FrbA= github.com/rubenv/sql-migrate v1.3.1/go.mod h1:YzG/Vh82CwyhTFXy+Mf5ahAiiEOpAlHurg+23VEzcsk= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.2.4 h1:CpMSDKan0LtNGGhPrvupAoLeObRFjND8/tU1rEOtBp4= -github.com/ryancurrah/gomodguard v1.2.4/go.mod h1:+Kem4VjWwvFpUJRJSwa16s1tBJe+vbv02+naTow2f6M= -github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= -github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= +github.com/ryancurrah/gomodguard v1.3.0 h1:q15RT/pd6UggBXVBuLps8BXRvl5GPBcwVA7BJHMLuTw= +github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28XeGnid8dnni50= +github.com/ryanrolds/sqlclosecheck v0.4.0 h1:i8SX60Rppc1wRuyQjMciLqIzV3xnoHB7/tXbr6RGYNI= +github.com/ryanrolds/sqlclosecheck v0.4.0/go.mod h1:TBRRjzL31JONc9i4XMinicuo+s+E8yKZ5FN8X3G6CKQ= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= +github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA= github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY= github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wqlbJtbyPzSgaxHTv8uN1pMpkG1t8= github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ= -github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA= -github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= +github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc= +github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b h1:qYTY2tN72LhgDj2rtWG+LI6TXFl2ygFQQ4YezfVaGQE= github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b/go.mod h1:/pA7k3zsXKdjjAiUhB5CjuKib9KJGCaLvZwtxGC8U0s= github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= -github.com/sashamelentyev/usestdlibvars v1.20.0 h1:K6CXjqqtSYSsuyRDDC7Sjn6vTMLiSJa4ZmDkiokoqtw= -github.com/sashamelentyev/usestdlibvars v1.20.0/go.mod h1:0GaP+ecfZMXShS0A94CJn6aEuPRILv8h/VuWI9n1ygg= -github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= +github.com/sashamelentyev/usestdlibvars v1.24.0 h1:MKNzmXtGh5N0y74Z/CIaJh4GlB364l0K1RUT08WSWAc= +github.com/sashamelentyev/usestdlibvars v1.24.0/go.mod h1:9cYkq+gYJ+a5W2RPdhfaSCnTVUC1OQP/bSiiBhq3OZE= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/securego/gosec/v2 v2.13.1 h1:7mU32qn2dyC81MH9L2kefnQyRMUarfDER3iQyMHcjYM= -github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/securego/gosec/v2 v2.17.0 h1:ZpAStTDKY39insEG9OH6kV3IkhQZPTq9a9eGOLOjcdI= +github.com/securego/gosec/v2 v2.17.0/go.mod h1:lt+mgC91VSmriVoJLentrMkRCYs+HLTBnUFUBuhV2hc= 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= @@ -1747,93 +1498,69 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g 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.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI= -github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE= +github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8= github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= -github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE= -github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= +github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= +github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= github.com/slack-go/slack v0.11.3 h1:GN7revxEMax4amCc3El9a+9SGnjmBvSUobs0QnO6ZO8= github.com/slack-go/slack v0.11.3/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= -github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= -github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= -github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= +github.com/sonatard/noctx v0.0.2/go.mod h1:kzFz+CzWSjQ2OzIm46uJZoXuBpa2+0y3T36U18dWqIo= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/sourcegraph/go-diff v0.7.1-0.20230316160316-1b4d09c1adcb h1:YpilTUahAC0HRIP/kwrOfEl4Vn3zGib8jErQwKP7Qm0= github.com/sourcegraph/go-diff v0.7.1-0.20230316160316-1b4d09c1adcb/go.mod h1:rVYgZW/iJS0asc5BHoaNaCr4uve5oOMXSWpNOhfO2wE= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= -github.com/spotinst/spotinst-sdk-go v1.129.0 h1:1HuySAZ0LuBTmPWGa2I1c6CHx8j+mnrf7B475F2Ub9o= -github.com/spotinst/spotinst-sdk-go v1.129.0/go.mod h1:C6mrT7+mqOgPyabacjyYTvilu8Xm96mvTvrZQhj99WI= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= +github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= +github.com/spotinst/spotinst-sdk-go v1.133.0 h1:X+CQaYlPbwuTdz9C8mQ6/ON7T0GexSPWXJgjzVrM88E= +github.com/spotinst/spotinst-sdk-go v1.133.0/go.mod h1:C6mrT7+mqOgPyabacjyYTvilu8Xm96mvTvrZQhj99WI= github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1845,24 +1572,27 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= -github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= +github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk= +github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= +github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg= github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM= github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog= github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= -github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= -github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= +github.com/tetafro/godot v1.4.14 h1:ScO641OHpf9UpHPk8fCknSuXNMpi4iFlwuWoBs3L+1s= +github.com/tetafro/godot v1.4.14/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= -github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= +github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= @@ -1870,24 +1600,15 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= -github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro= -github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timonwong/loggercheck v0.9.3 h1:ecACo9fNiHxX4/Bc02rW2+kaJIAMAes7qJ7JKxt0EZI= -github.com/timonwong/loggercheck v0.9.3/go.mod h1:wUqnk9yAOIKtGA39l1KLE9Iz0QiTocu/YZoOf+OzFdw= -github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= +github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M= +github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ= +github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4= +github.com/timonwong/loggercheck v0.9.4/go.mod h1:caz4zlPcgvpEkXgVnAJGowHAMW2NwHaNlpS8xDbVhTg= github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= -github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= -github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= -github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= -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= -github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tomarrell/wrapcheck/v2 v2.7.0 h1:J/F8DbSKJC83bAvC6FoZaRjZiZ/iKoueSdrEkmGeacA= -github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= -github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= +github.com/tomarrell/wrapcheck/v2 v2.8.1 h1:HxSqDSN0sAt0yJYsrcYVoEeyM4aI9yAm3KQpIXDJRhQ= +github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2Uow/Vdm9NQcl5SE= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 h1:nrZ3ySNYwJbSpD6ce9duiP+QkD3JuLCcWkdaehUS/3Y= @@ -1895,45 +1616,32 @@ github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFy github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= -github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= +github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= -github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= -github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= +github.com/uudashr/gocognit v1.0.7 h1:e9aFXgKgUJrQ5+bs61zBigmj7bFJ/5cC6HmMahVzuDo= +github.com/uudashr/gocognit v1.0.7/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME= github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= github.com/vburenin/ifacemaker v1.2.1 h1:3Vq8B/bfBgjWTkv+jDg4dVL1KHt3k1K4lO7XRxYA2sk= github.com/vburenin/ifacemaker v1.2.1/go.mod h1:5WqrzX2aD7/hi+okBjcaEQJMg4lDGrpuEX3B8L4Wgrs= -github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= -github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= +github.com/vektra/mockery/v2 v2.35.3 h1:vByZs56dObWBooh5SQUA1TmQYbPBrMnmBTF3wcY+9m4= +github.com/vektra/mockery/v2 v2.35.3/go.mod h1:diB13hxXG6QrTR0ol2Rk8s2dRMftzvExSvPDKr+IYKk= github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 h1:txplJASvd6b/hrE0s/Ixfpp2cuwH9IO9oZBAN9iYa4A= github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2/go.mod h1:DGCIhurYgnLz8J9ga1fMV/fbLDyUvTyrWXVWUIyJon4= github.com/weaveworks/goformation/v4 v4.10.2-0.20230526082129-5f5eaa9609b8 h1:qjATkrajxxCgWIQaVgOmG8RiRwGGn1mOm6szwVty7zA= github.com/weaveworks/goformation/v4 v4.10.2-0.20230526082129-5f5eaa9609b8/go.mod h1:x92o12+Azh6DQ4yoXT5oEuE7dhQHR5V2vy/fmZ6pO7k= -github.com/weaveworks/launcher v0.0.2-0.20200715141516-1ca323f1de15 h1:i/RhLevywqC6cuUWtGdoaNrsJd+/zWh3PXbkXZIyZsU= -github.com/weaveworks/launcher v0.0.2-0.20200715141516-1ca323f1de15/go.mod h1:w9Z1vnQmPobkEZ0F3oyiqRYP+62qDqTGnK6t5uhe1kg= github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848 h1:I7S+IHZIU49skVgTNArf9bIdy07mCn1Z0zv1r07ROws= github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848/go.mod h1:y8Luzq6JDsYVoIV0QAlnvIiq8bSaap0myMjWKyzVFTY= -github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= -github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 h1:+dBg5k7nuTE38VVdoroRsT0Z88fmvdYrI2EjzJst35I= github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1/go.mod h1:nmuySobZb4kFgFy6BptpXp/BBw+xFSyvVPP6auoJB4k= -github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= github.com/xanzy/go-gitlab v0.73.1 h1:UMagqUZLJdjss1SovIC+kJCH4k2AZWXl58gJd38Y/hI= github.com/xanzy/go-gitlab v0.73.1/go.mod h1:d/a0vswScO7Agg1CZNz15Ic6SSvBG9vfw8egL99t4kA= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo= github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= @@ -1945,13 +1653,12 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1: github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= 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/xen0n/gosmopolitan v1.2.1 h1:3pttnTuFumELBRSh+KQs1zcz4fN6Zy7aB0xlnQSn1Iw= +github.com/xen0n/gosmopolitan v1.2.1/go.mod h1:JsHq/Brs1o050OOdmzHeOr0N7OtlnKRAGAsElF8xBQA= github.com/xgfone/netaddr v0.5.1 h1:87DhCyyR6XUr0p63JHTDT5juGDhH49Ak2ePZNBmSL5I= github.com/xgfone/netaddr v0.5.1/go.mod h1:QDEYI/4nQfAtNj7TB4RhYQY1B4U31Edj+SOoDEuIfsQ= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= -github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -1959,6 +1666,8 @@ github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= +github.com/ykadowak/zerologlint v0.1.3 h1:TLy1dTW3Nuc+YE3bYRPToG1Q9Ej78b5UUN6bjbGdxPE= +github.com/ykadowak/zerologlint v0.1.3/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1971,54 +1680,16 @@ github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTN github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= -github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= -github.com/zmap/zcrypto v0.0.0-20210123152837-9cf5beac6d91/go.mod h1:R/deQh6+tSWlgI9tb4jNmXxn8nSCabl5ZQsBX9//I/E= -github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlNMRnSUTU3P1UdukWhYGifqEsjk9fn7BCk= -github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU= -gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= -gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= +gitlab.com/bosi/decorder v0.4.0 h1:HWuxAhSxIvsITcXeP+iIRg9d1cVfvVkmlF7M68GaoDY= +gitlab.com/bosi/decorder v0.4.0/go.mod h1:xarnteyUoJiOTEldDysquWKTVDCKo2TOIOIibSuWqOg= gitlab.com/digitalxero/go-conventional-commit v1.0.7 h1:8/dO6WWG+98PMhlZowt/YjuiKhqhGlOCwlIV8SqqGh8= gitlab.com/digitalxero/go-conventional-commit v1.0.7/go.mod h1:05Xc2BFsSyC5tKhK0y+P3bs0AwUtNuTp+mTpbCU/DZ0= +go-simpler.org/assert v0.6.0 h1:QxSrXa4oRuo/1eHMXSBFHKvJIpWABayzKldqZyugG7E= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.6 h1:Cy2qx3npLcYqTKqGJzMypnMv2tiRyifZJ17BlWIWA7A= -go.etcd.io/etcd/api/v3 v3.5.6/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.6 h1:TXQWYceBKqLp4sa87rcPs11SXxUA/mHwH975v+BDvLU= -go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= -go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.6 h1:fIDR0p4KMjw01MJMfUIDWdQbjo06PD6CeYM5z4EHLi0= -go.etcd.io/etcd/client/v2 v2.305.6/go.mod h1:BHha8XJGe8vCIBfWBpbBLVZ4QjOIlfoouvOwydu63E0= -go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/client/v3 v3.5.6 h1:coLs69PWCXE9G4FKquzNaSHrRyMCAXwF+IX1tAPVO8E= -go.etcd.io/etcd/client/v3 v3.5.6/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= -go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 h1:odMFuQQCg0UmPd7Cyw6TViRYv9ybGuXuki4CusDSzqA= -go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0/go.mod h1:YPwSaBciV5G6Gpt435AasAG3ROetZsKNUzibRa/++oo= -go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 h1:3yLUEC0nFCxw/RArImOyRUI4OAFbg4PFpBbAhSNzKNY= -go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY= -go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0/go.mod h1:FAwse6Zlm5v4tEWZaTjmNhe17Int4Oxbu7+2r0DiD3w= -go.etcd.io/etcd/raft/v3 v3.5.0 h1:kw2TmO3yFTgE+F0mdKkG7xMxkit2duBDa2Hu6D/HMlw= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0-alpha.0/go.mod h1:tsKetYpt980ZTpzl/gb+UOJj9RkIyCb1u4wjzMg90BQ= -go.etcd.io/etcd/server/v3 v3.5.0 h1:jk8D/lwGEDlQU9kZXUFMSANkE22Sg5+mW27ip8xcF9E= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 h1:UcRoCA1FgXoc4CEM8J31fqEvI69uFIObY5ZDEFH7Znc= -go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0/go.mod h1:HnrHxjyCuZ8YDt8PYVyQQ5d1ZQfzJVEtQWllr5Vp/30= -go.etcd.io/etcd/v3 v3.5.0-alpha.0 h1:ZuqKJkD2HrzFUj8IB+GLkTMKZ3+7mWx172vx6F1TukM= -go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -2028,102 +1699,71 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= -go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 h1:sO4WKdPAudZGKPcpZT4MJn6JaDmpyLrMPDGGyA1SttE= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/metric v0.20.0 h1:4kzhXFP+btKm4jwxpjIqjs41A7MakRFUS86bqLHTIw8= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/oteltest v0.20.0 h1:HiITxCawalo5vQzdHfKeZurV8x7ljcqAgiWzF6Vaeaw= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0 h1:JsxtGXd06J8jrnya7fdI/U/MR6yXA5DtbZy+qoHQlr8= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0 h1:c5VRjxCXdQlx1HjzwGdQHzZaVI82b5EbBgOu2ljD92g= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/metric v0.20.0 h1:7ao1wpzHRVKf0OQ7GIxiQJA6X7DLX9o14gmVon7mMK8= -go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v0.20.0 h1:1DL6EXUdcg95gukhuRRvLDO/4X5THh/5dIV52lqtnbw= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= +go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= +go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= gocloud.dev v0.26.0 h1:4rM/SVL0lLs+rhC0Gmc+gt/82DBpb7nbpIZKXXnfMXg= gocloud.dev v0.26.0/go.mod h1:mkUgejbnbLotorqDyvedJO20XcZNTynmSeVSQS9btVg= golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ= -golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/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/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -2134,12 +1774,12 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk= -golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= +golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -2169,19 +1809,19 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -2190,16 +1830,12 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2207,7 +1843,6 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -2220,7 +1855,6 @@ golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -2233,26 +1867,24 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/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-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2263,7 +1895,6 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -2273,13 +1904,12 @@ golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2288,8 +1918,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2297,10 +1928,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2309,24 +1937,19 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2338,7 +1961,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2348,13 +1970,9 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2363,13 +1981,11 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2383,11 +1999,10 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2400,29 +2015,36 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2432,35 +2054,30 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= -golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -2469,15 +2086,11 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2485,7 +2098,6 @@ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2493,7 +2105,6 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -2504,41 +2115,28 @@ golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200313205530-4303120df7d8/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2550,15 +2148,17 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= +golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2567,14 +2167,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -2593,7 +2189,6 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.45.0/go.mod h1:ISLIJCedJolbZvDfAk+Ctuq5hf+aJ33WgtUsfyFoLXA= google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= @@ -2615,29 +2210,22 @@ google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7 google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.107.0 h1:I2SlFjD8ZWabaIFOfeEDg3pf0BHJDh6iYQ1ic3Yu/UU= -google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= +google.golang.org/api v0.143.0 h1:o8cekTkqhywkbZT6p1UHJPZ9+9uuCAJs/KYomxZB8fA= +google.golang.org/api v0.143.0/go.mod h1:FoX9DO9hT7DLNn97OuoZAGSDuNAXdJRuGK98rSUgurk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -2654,7 +2242,6 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -2666,7 +2253,6 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2677,11 +2263,8 @@ google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210331142528-b7513248f0ba/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210517163617-5e0236093d7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -2724,18 +2307,17 @@ google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 h1:wJT65XLOzhpSPCdAmmKfz94SlmnQzDzjm3Cj9k3fsXY= -google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -2745,7 +2327,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= @@ -2759,11 +2340,10 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.52.0 h1:kd48UiU7EHsV4rnLyOJRuP/Il/UHE7gdDAQ+SZI7nZk= -google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2775,13 +2355,12 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= @@ -2791,9 +2370,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= @@ -2801,22 +2377,15 @@ gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk= gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= @@ -2838,12 +2407,9 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= helm.sh/helm/v3 v3.11.2 h1:P3cLaFxfoxaGLGJVnoPrhf1j86LC5EDINSpYSpMUkkA= helm.sh/helm/v3 v3.11.2/go.mod h1:Hw+09mfpDiRRKAgAIZlFkPSeOkvv7Acl5McBvQyNPVw= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2851,98 +2417,75 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= -honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -k8s.io/api v0.23.12 h1:H8bHQImNLPwv/Y8+Oy8vrJuXOsdLSgSgZ75vMCKslq0= -k8s.io/api v0.23.12/go.mod h1:qH4k2H3Jd990i7L8BSCuY/I0sN+8EYiqfxb08zXz1bA= -k8s.io/apiextensions-apiserver v0.23.12 h1:4iIDVbwuipqCUaeypTqlYffz9JVKXHtp2DppQGOgN3I= -k8s.io/apiextensions-apiserver v0.23.12/go.mod h1:/zL+M8irIQOIDcf86zyq/QkHiXRzrbJocz1IL+kVons= -k8s.io/apimachinery v0.23.13-rc.0 h1:UtvqiRf2JQmaxMdqNJ/J1hRD9DPWOpMprYEXF8QOgEw= -k8s.io/apimachinery v0.23.13-rc.0/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apiserver v0.23.12 h1:eex5zPPRdO+FeZh2l8Les+/kOFLHe410yHTUmWOzrQ4= -k8s.io/apiserver v0.23.12/go.mod h1:OM6eBZn1uKP82x+eJpVSyO9DYk9zl2E6euw7bxIk734= -k8s.io/cli-runtime v0.24.1 h1:IW6L8dRBq+pPTzvXcB+m/hOabzbqXy57Bqo4XxmW7DY= -k8s.io/cli-runtime v0.24.1/go.mod h1:14aVvCTqkA7dNXY51N/6hRY3GUjchyWDOwW84qmR3bs= -k8s.io/client-go v0.24.0-alpha.4 h1:CrJwvkWK2L0ePyF+d2pDzGxDUpiXIVeFuaDrI4C4u8E= -k8s.io/client-go v0.24.0-alpha.4/go.mod h1:IZXA44q5NL29yfDhMECGScl1y97ZCwsso/zzcJvOnPY= -k8s.io/cloud-provider v0.23.12 h1:SxubVorjoMneQjdhW2dvKgd8Q6OLbFtCseNuT9Tvfvw= -k8s.io/cloud-provider v0.23.12/go.mod h1:jP1G2nd10t/XXctqaVz9WbxeazqXuQVcr2LBRTc9Zuc= -k8s.io/cloud-provider-aws v1.25.0 h1:kTnNfMA4FDDAdPXWjc+aj8IzSn3iqMUqWTMmzElyCIs= -k8s.io/cloud-provider-aws v1.25.0/go.mod h1:RaSxyc4nlJkBLSuKEf6rLA2gLhfbU7GrTGhGSYvVFsY= -k8s.io/code-generator v0.23.13-rc.0 h1:g5mGDy6hfGynlrzD0KmwPRj/TH00rRnoNdAdleGCfAc= -k8s.io/code-generator v0.23.13-rc.0/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= -k8s.io/component-base v0.23.12 h1:SeuPAWkJc04AOlCzPnpqyub+6CTjBfDUCSGiqdueEC4= -k8s.io/component-base v0.23.12/go.mod h1:cKobdyrM3xbUnBwPa0m+EMse5gb6fNbKUtFRaBo/QWw= -k8s.io/component-helpers v0.23.12/go.mod h1:ure1ne784Cc9SosWYXnEKRdn1Uq72GtVLU5eCf8zMpE= -k8s.io/controller-manager v0.23.12/go.mod h1:YurevrsdSiEGI6WrEGfRJyb0vZxgwo3fEt3878yJ08E= -k8s.io/csi-translation-lib v0.23.12 h1:3o2svEc6x8LeeCzxdYtqQpPPIT5hkCzK91Rij64zDbs= -k8s.io/csi-translation-lib v0.23.12/go.mod h1:aaPacoHCMvbuIPtRt7X2fXAFM6VCz6BnEE0O9YyuiaQ= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +honnef.co/go/tools v0.4.5 h1:YGD4H+SuIOOqsyoLOpZDWcieM28W47/zRO7f+9V3nvo= +honnef.co/go/tools v0.4.5/go.mod h1:GUV+uIBCLpdf0/v6UhHHG/yzI/z6qPskBeQCjcNB96k= +k8s.io/api v0.25.11 h1:4mjYDfE3yp22jrytjH0knwgzjXKkxHX4D01ZCAazvZM= +k8s.io/api v0.25.11/go.mod h1:bK4UvD4bthtutNlvensrfBX21PRQ/vs2cIYggHkOOAo= +k8s.io/apiextensions-apiserver v0.25.11 h1:qZY0kCt0tW3QHPKcogp3k4zrlZhe9f8H6EJOr7sNRbA= +k8s.io/apiextensions-apiserver v0.25.11/go.mod h1:wsXndE5H00YrPUF/H6KuuNwW2VyYKnKsh8/R9eq4KMs= +k8s.io/apimachinery v0.25.11 h1:2EhfdrSAMvBxsswvOGCEymKk4ZnHZkranuZqdR0rsO4= +k8s.io/apimachinery v0.25.11/go.mod h1:IFwbcNi3gKkfDhuy0VYu3+BwbxbiIov3p6FR8ge1Epc= +k8s.io/apiserver v0.25.11 h1:LDJbRe4bbjCUTy6F3LHflcfEdaYDNQdMrVEca+/mZ6w= +k8s.io/apiserver v0.25.11/go.mod h1:E3YRqMn6Hr9RBkBevjf/mtd8az2rfawRedig8Rinei4= +k8s.io/cli-runtime v0.25.11 h1:GE2yNZm1tN+MJtw1SGMOLesLF7Kp7NVAVqRSTbXfu4o= +k8s.io/cli-runtime v0.25.11/go.mod h1:r/nEINuHVEpgGhcd2WamU7hD1t/lMnSz8XM44Autltc= +k8s.io/client-go v0.25.11 h1:DJQ141UsbNRI6wYSlcYLP5J5BW5Wq7Bgm42Ztq2SW70= +k8s.io/client-go v0.25.11/go.mod h1:41Xs7p1SfhoReUnmjjYCfCNWFiq4xSkexwJfbxF2F7A= +k8s.io/cloud-provider v0.25.11 h1:t/mMWKvO52IrznQ5dAziigNt+EzXuM9jWfisEmAaaYQ= +k8s.io/cloud-provider v0.25.11/go.mod h1:9xL8k1YZsU6dCN3djftvum0y84rwYW+xorF+8LFs5Ho= +k8s.io/cloud-provider-aws v1.25.1 h1:coux06A4qvG6/IDt5a2YBKl5o9j3YAzT6dArZDUawBA= +k8s.io/cloud-provider-aws v1.25.1/go.mod h1:BizrTUsF5lW3esndEaE++FW8P0ENBdAiKptj0BQrTBo= +k8s.io/code-generator v0.25.11 h1:HXWJcqNU29wgn5u30ow2Cta8PC6Hgfl0a1MoaWufGJE= +k8s.io/code-generator v0.25.11/go.mod h1:FA5a4rk4tMTCgmiDeNdRjml+AGvm72SwZYwD5lBrezY= +k8s.io/component-base v0.25.11 h1:3QmISCE9n9CJkVpTA4spQO1IZCrLlOwbKdzSN9dqZZA= +k8s.io/component-base v0.25.11/go.mod h1:wFR4pfB+xTc6FBak+RoWRNeTmelGE4XWJP/xVOvn3vM= +k8s.io/csi-translation-lib v0.25.11 h1:JgpoBenEAfCjpbfwjCPvL8bI/P9un+BQUV/uNxZnhP0= +k8s.io/csi-translation-lib v0.25.11/go.mod h1:Ff2gRYDRoGkoIoosW3jcZ6Q1T0MO+iZEGO21RSVKWbs= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20220913193501-391367153a38 h1:yGN2TZt9XIl5wrcYaFtVMqzP2GIzX5gIcOObCZCuDeA= -k8s.io/gengo v0.0.0-20220913193501-391367153a38/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 h1:iu3o/SxaHVI7tKPtkGzD3M9IzrE21j+CUKH98NQJ8Ms= +k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kops v1.25.2 h1:ToP6P3L4A+HJhcZgzNqWqEU7faCSDpG6hLXgj88/YRc= -k8s.io/kops v1.25.2/go.mod h1:xTWLLCq+oAUUEEbs1fFYtyTRn7dY9KFKKO+y1OfjVvo= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18/go.mod h1:p8bjuqy9+BWvBDEBjdeVYtX6kMWWg6OhY1V1jhC9MPI= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/kops v1.25.4 h1:jsCfUk4TLpJKNoy2xvdDSujDfYWkEUu02pdI+J3AuoI= +k8s.io/kops v1.25.4/go.mod h1:De2552OtQN9EOiRyUNr82yV45ZKYkQ8xZMJAhtK7jWE= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/kubectl v0.24.1 h1:gxcjHrnwntV1c+G/BHWVv4Mtk8CQJ0WTraElLBG+ddk= -k8s.io/kubectl v0.24.1/go.mod h1:NzFqQ50B004fHYWOfhHTrAm4TY6oGF5FAAL13LEaeUI= -k8s.io/kubelet v0.23.12 h1:SMEUvjDvhNKXqHbrKWFeOouXWcKUPpMW7aiFf3Ct5cE= -k8s.io/kubelet v0.23.12/go.mod h1:Kr69d7WN1Z+l6TtddCD8OlqjWbpWLXyk8oX3Lw57OLo= -k8s.io/metrics v0.23.12/go.mod h1:2JJfTh5JjsfSNy4g70BP0+P0n0Xfa0w36p0on6JiY5Y= +k8s.io/kubectl v0.25.5 h1:m3Y3ysrlRR+wAD0TYoFCrngcYtwVH7UPCqubEwbe6oo= +k8s.io/kubectl v0.25.5/go.mod h1:EeHEydYE+pR8EUo5LkO27CP9ONxZpdmE2BWPEqTS8hY= +k8s.io/kubelet v0.25.11 h1:yOH5o7GKNrkXs2e1y+cng2WAbyVXM1r4+mJfl+PekcY= +k8s.io/kubelet v0.25.11/go.mod h1:Y3veoHBt6yALYPLxsnmvlGDD+mlWxk7oduyxOEuiFn8= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= -k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= -mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E= +mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk= +mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d h1:3rvTIIM22r9pvXk+q3swxUQAQOxksVMGK7sml4nG57w= +mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RFiZMMsLVL+A96Nvptar8Fj71is= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= oras.land/oras-go v1.2.2 h1:0E9tOHUfrNH7TCDk5KU0jVBEzCqbfdyuVfGmJ7ZeRPE= oras.land/oras-go v1.2.2/go.mod h1:Apa81sKoZPpP7CDciE006tSZ0x3Q3+dOoBcMZ/aNxvw= -pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM= sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s= -sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg= -sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg= sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk= sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= sigs.k8s.io/mdtoc v1.1.0 h1:q3YtqYzmC2e0hgLXRIOm7/QLuPux1CX3ZHCwlbABxZo= sigs.k8s.io/mdtoc v1.1.0/go.mod h1:QZLVEdHH2iNIR4uHAZyvFRtjloHgVItk8lo/mzCtq3w= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/integration/main.go b/integration/main.go index 50026d4bf7..3600592bbb 100644 --- a/integration/main.go +++ b/integration/main.go @@ -123,7 +123,11 @@ func runGinkgo(ctx context.Context, wg *sync.WaitGroup, summaries chan []string, } } - args := []string{"--no-color", fmt.Sprintf("--timeout=%s", suiteTimeout), "-tags", "integration", "-v", "--progress"} + var args []string + if ginkgoArgs := os.Getenv("GINKGO_ARGS"); ginkgoArgs != "" { + args = strings.Split(ginkgoArgs, " ") + } + args = append(args, "--no-color", fmt.Sprintf("--timeout=%s", suiteTimeout), "-tags", "integration", "-v", "--show-node-events", "--poll-progress-after", "30m") if focus := os.Getenv("INTEGRATION_TEST_FOCUS"); focus != "" { args = append(args, fmt.Sprintf(`--focus="%s"`, focus)) } diff --git a/integration/matchers/kubernetes.go b/integration/matchers/kubernetes.go index 233f67d3f0..5885e8356e 100644 --- a/integration/matchers/kubernetes.go +++ b/integration/matchers/kubernetes.go @@ -9,8 +9,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" ) -//BeNotFoundError succeeds if actual is a non-nil error -//which represents a missing kubernetes resource +// BeNotFoundError succeeds if actual is a non-nil error +// which represents a missing kubernetes resource func BeNotFoundError() types.GomegaMatcher { return ¬FoundMatcher{} } diff --git a/integration/scripts/download-previous-release.sh b/integration/scripts/download-previous-release.sh index f16a78b88b..b11f924e11 100755 --- a/integration/scripts/download-previous-release.sh +++ b/integration/scripts/download-previous-release.sh @@ -1,8 +1,8 @@ #!/bin/sh -ex -GIT_REPO_URL="https://github.com/weaveworks/eksctl" -RELEASE_URL_FORMAT="https://github.com/weaveworks/eksctl/releases/download/v%s/eksctl_Linux_amd64.tar.gz" +GIT_REPO_URL="https://github.com/eksctl-io/eksctl" +RELEASE_URL_FORMAT="https://github.com/eksctl-io/eksctl/releases/download/v%s/eksctl_Linux_amd64.tar.gz" download_previous_release() { previous_tag=$(git ls-remote --tags $GIT_REPO_URL | grep -E -v "(refs/tags/(latest_release|v))|\-rc|\{\}" | cut -d/ -f3 | sort -Vr \ diff --git a/integration/tests/crud/creategetdelete_test.go b/integration/tests/crud/creategetdelete_test.go index 4974485540..67a92628f3 100644 --- a/integration/tests/crud/creategetdelete_test.go +++ b/integration/tests/crud/creategetdelete_test.go @@ -285,11 +285,15 @@ var _ = Describe("(Integration) Create, Get, Scale & Delete", func() { Context("can add a nodegroup into a new subnet", func() { var ( - subnet *types.Subnet - nodegroupName string + subnet *types.Subnet + nodegroupNameCLI string + nodegroupNameConfigFile string + subnetName string ) BeforeEach(func() { - nodegroupName = "test-extra-nodegroup" + nodegroupNameCLI = "test-extra-nodegroup-cli" + nodegroupNameConfigFile = "text-extra-nodegroup-config-file" + subnetName = "new-subnet" }) AfterEach(func() { cmd := params.EksctlDeleteCmd.WithArgs( @@ -297,7 +301,16 @@ var _ = Describe("(Integration) Create, Get, Scale & Delete", func() { "--verbose", "4", "--cluster", params.ClusterName, "--wait", - nodegroupName, + nodegroupNameCLI, + ) + Expect(cmd).To(RunSuccessfully()) + + cmd = params.EksctlDeleteCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + "--wait", + nodegroupNameConfigFile, ) Expect(cmd).To(RunSuccessfully()) config := NewConfig(params.Region) @@ -343,6 +356,7 @@ var _ = Describe("(Integration) Create, Get, Scale & Delete", func() { tags = append(tags, t) } } + // create a new subnet in that given vpc and zone. output, err := ec2.CreateSubnet(context.Background(), &awsec2.CreateSubnetInput{ AvailabilityZone: aws.String("us-west-2a"), CidrBlock: aws.String(cidr), @@ -380,7 +394,7 @@ var _ = Describe("(Integration) Create, Get, Scale & Delete", func() { }) Expect(err).NotTo(HaveOccurred(), routput) - // create a new subnet in that given vpc and zone. + // create a nodegroup into the new subnet via CLI cmd := params.EksctlCreateCmd.WithArgs( "nodegroup", "--timeout", nodegroupTimeout, @@ -388,9 +402,46 @@ var _ = Describe("(Integration) Create, Get, Scale & Delete", func() { "--nodes", "1", "--node-type", "p2.xlarge", "--subnet-ids", *subnet.SubnetId, - nodegroupName, + nodegroupNameCLI, ) Expect(cmd).To(RunSuccessfully()) + + // create a nodegroup into the new subnet via config file + clusterConfig := makeClusterConfig() + clusterConfig.VPC = &api.ClusterVPC{ + Network: api.Network{ + ID: *s.VpcId, + }, + Subnets: &api.ClusterSubnets{ + Public: api.AZSubnetMapping{ + subnetName: api.AZSubnetSpec{ + ID: *subnet.SubnetId, + }, + }, + }, + } + clusterConfig.NodeGroups = []*api.NodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Name: nodegroupNameConfigFile, + ScalingConfig: &api.ScalingConfig{ + DesiredCapacity: aws.Int(1), + }, + Subnets: []string{subnetName}, + }, + }, + } + + cmd = params.EksctlCreateCmd. + WithArgs( + "nodegroup", + "--config-file", "-", + "--verbose", "4", + "--timeout", nodegroupTimeout, + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) + Expect(cmd).To(RunSuccessfully()) }) }) diff --git a/integration/tests/existing_vpc/existing_vpc_test.go b/integration/tests/existing_vpc/existing_vpc_test.go index 84151ad150..a5e37a680d 100644 --- a/integration/tests/existing_vpc/existing_vpc_test.go +++ b/integration/tests/existing_vpc/existing_vpc_test.go @@ -6,7 +6,7 @@ package unowned import ( "context" "fmt" - "io/ioutil" + "os" "strings" "testing" "time" @@ -166,7 +166,7 @@ func createVPC(stackName string, ctl api.ClusterProvider) *api.ClusterVPC { } func createVPCStackAndGetOutputs(stackName string, ctl api.ClusterProvider) ([]string, []string, string, string) { - templateBody, err := ioutil.ReadFile("cf-template.yaml") + templateBody, err := os.ReadFile("cf-template.yaml") Expect(err).NotTo(HaveOccurred()) createStackInput := &cfn.CreateStackInput{ StackName: &stackName, diff --git a/integration/tests/gitops/flux_test.go b/integration/tests/gitops/flux_test.go index 579a17d3d1..1c17d0956b 100644 --- a/integration/tests/gitops/flux_test.go +++ b/integration/tests/gitops/flux_test.go @@ -5,6 +5,7 @@ package integration_test import ( "fmt" + "strconv" "testing" . "github.com/weaveworks/eksctl/integration/matchers" @@ -77,6 +78,7 @@ var _ = Describe("Enable GitOps", func() { "owner": params.GitopsOwner, "branch": branch, "repository": repository, + "personal": strconv.FormatBool(params.IsGitopsOwnerPersonal), }, }, }, diff --git a/integration/tests/ipv6/ipv6_test.go b/integration/tests/ipv6/ipv6_test.go index e38793951e..b40dd082fa 100644 --- a/integration/tests/ipv6/ipv6_test.go +++ b/integration/tests/ipv6/ipv6_test.go @@ -8,7 +8,6 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" "os" "testing" "time" @@ -50,7 +49,7 @@ func TestIPv6(t *testing.T) { var clusterConfig *api.ClusterConfig var _ = BeforeSuite(func() { - f, err := ioutil.TempFile("", "kubeconfig-") + f, err := os.CreateTemp("", "kubeconfig-") Expect(err).NotTo(HaveOccurred()) params.KubeconfigPath = f.Name() params.KubeconfigTemp = true diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go index 15220cfe5e..32a4940889 100644 --- a/integration/tests/managed/managed_nodegroup_test.go +++ b/integration/tests/managed/managed_nodegroup_test.go @@ -6,12 +6,9 @@ package managed import ( "context" "fmt" - "strings" "testing" "time" - ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" - "github.com/aws/aws-sdk-go-v2/aws" awseks "github.com/aws/aws-sdk-go-v2/service/eks" @@ -25,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/weaveworks/eksctl/integration/matchers" . "github.com/weaveworks/eksctl/integration/runner" "github.com/weaveworks/eksctl/integration/tests" clusterutils "github.com/weaveworks/eksctl/integration/utilities/cluster" @@ -35,31 +31,21 @@ import ( "github.com/weaveworks/eksctl/pkg/testutils" ) -const ( - k8sUpdatePollInterval = "2s" - k8sUpdatePollTimeout = "3m" -) - var params *tests.Params func init() { // Call testing.Init() prior to tests.NewParams(), as otherwise -test.* will not be recognised. See also: https://golang.org/doc/go1.13#testing testing.Init() - params = tests.NewParams("managed") - supportedVersions := api.SupportedVersions() - if len(supportedVersions) < 2 { - panic("managed nodegroup tests require at least two supported Kubernetes versions to run") - } - params.Version = supportedVersions[len(supportedVersions)-2] + params = tests.NewParamsWithGivenClusterName("managed", "test-cluster") } func TestManaged(t *testing.T) { testutils.RegisterAndRun(t) } -const initialAl2Nodegroup = "al2-1" +const initialAl2Nodegroup = "ng-al2" -var _ = BeforeSuite(func() { +var _ = SynchronizedBeforeSuite(func() { fmt.Fprintf(GinkgoWriter, "Using kubeconfig: %s\n", params.KubeconfigPath) cmd := params.EksctlCreateCmd.WithArgs( @@ -76,27 +62,39 @@ var _ = BeforeSuite(func() { "--kubeconfig", params.KubeconfigPath, ) Expect(cmd).To(RunSuccessfully()) -}) +}, func() {}) var _ = Describe("(Integration) Create Managed Nodegroups", func() { const ( - bottlerocketGPU = "bottlerocket-gpu" - bottlerocketNodegroup = "bottlerocket-1" - ubuntuNodegroup = "ubuntu-1" - newPublicNodeGroup = "ng-public-1" - newPrivateNodeGroup = "ng-private-1" + updateConfigNodegroup = "ng-update-config" + bottlerocketNodegroup = "ng-bottlerocket" + bottlerocketGPUNodegroup = "ng-bottlerocket-gpu" + ubuntuNodegroup = "ng-ubuntu" + publicNodeGroup = "ng-public" + privateNodeGroup = "ng-private" ) - makeClusterConfig := func() *api.ClusterConfig { - clusterConfig := api.NewClusterConfig() - clusterConfig.Metadata.Name = params.ClusterName - clusterConfig.Metadata.Region = params.Region - clusterConfig.Metadata.Version = params.Version - return clusterConfig - } + var ( + defaultTimeout = 20 * time.Minute - defaultTimeout := 20 * time.Minute + makeClusterConfig = func() *api.ClusterConfig { + clusterConfig := api.NewClusterConfig() + clusterConfig.Metadata.Name = params.ClusterName + clusterConfig.Metadata.Region = params.Region + clusterConfig.Metadata.Version = params.Version + return clusterConfig + } + + checkNg = func(ngName string) { + cmd := params.EksctlUtilsCmd.WithArgs( + "nodegroup-health", + "--cluster", params.ClusterName, + "--name", ngName, + ) + Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("active"))) + } + ) type managedCLIEntry struct { createArgs []string @@ -142,504 +140,389 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { }), ) - Context("cluster with 1 al2 managed nodegroup", func() { - Context("and add two managed nodegroups (one public and one private)", func() { - params.LogStacksEventsOnFailure() + Context("create test workloads", func() { + var ( + err error + test *harness.Test + ) - It("should not return an error for public node group", func() { - cmd := params.EksctlCreateCmd.WithArgs( - "nodegroup", - "--cluster", params.ClusterName, - "--nodes", "4", - "--managed", - "--instance-types", "t3a.xlarge", - newPublicNodeGroup, - ) - Expect(cmd).To(RunSuccessfully()) - }) + BeforeEach(func() { + test, err = kube.NewTest(params.KubeconfigPath) + Expect(err).ShouldNot(HaveOccurred()) + }) - It("should not return an error for private node group", func() { - cmd := params.EksctlCreateCmd.WithArgs( - "nodegroup", - "--cluster", params.ClusterName, - "--nodes", "2", - "--managed", - "--instance-types", "t3a.xlarge", - "--node-private-networking", - newPrivateNodeGroup, - ) - Expect(cmd).To(RunSuccessfully()) - }) + AfterEach(func() { + test.Close() + Eventually(func() int { + return len(test.ListPods(test.Namespace, metav1.ListOptions{}).Items) + }, "3m", "1s").Should(BeZero()) + }) - Context("create test workloads", func() { - var ( - err error - test *harness.Test - ) - - BeforeEach(func() { - test, err = kube.NewTest(params.KubeconfigPath) - Expect(err).ShouldNot(HaveOccurred()) - }) - - AfterEach(func() { - test.Close() - Eventually(func() int { - return len(test.ListPods(test.Namespace, metav1.ListOptions{}).Items) - }, "3m", "1s").Should(BeZero()) - }) - - It("should deploy podinfo service to the cluster and access it via proxy", func() { - d := test.CreateDeploymentFromFile(test.Namespace, "../../data/podinfo.yaml") - test.WaitForDeploymentReady(d, defaultTimeout) - - pods := test.ListPodsFromDeployment(d) - Expect(len(pods.Items)).To(Equal(2)) - - // For each pod of the Deployment, check we receive a sensible response to a - // GET request on /version. - for _, pod := range pods.Items { - Expect(pod.Namespace).To(Equal(test.Namespace)) - - req := test.PodProxyGet(&pod, "", "/version") - fmt.Fprintf(GinkgoWriter, "url = %#v", req.URL()) - - var js map[string]interface{} - test.PodProxyGetJSON(&pod, "", "/version", &js) - - Expect(js).To(HaveKeyWithValue("version", "1.5.1")) - } - }) - - It("should have functional DNS", func() { - d := test.CreateDaemonSetFromFile(test.Namespace, "../../data/test-dns.yaml") - test.WaitForDaemonSetReady(d, defaultTimeout) - { - ds, err := test.GetDaemonSet(test.Namespace, d.Name) - Expect(err).ShouldNot(HaveOccurred()) - fmt.Fprintf(GinkgoWriter, "ds.Status = %#v", ds.Status) - } - }) - - It("should have access to HTTP(S) sites", func() { - d := test.CreateDaemonSetFromFile(test.Namespace, "../../data/test-http.yaml") - test.WaitForDaemonSetReady(d, defaultTimeout) - { - ds, err := test.GetDaemonSet(test.Namespace, d.Name) - Expect(err).ShouldNot(HaveOccurred()) - fmt.Fprintf(GinkgoWriter, "ds.Status = %#v", ds.Status) - } - }) + It("should deploy podinfo service to the cluster and access it via proxy", func() { + d := test.CreateDeploymentFromFile(test.Namespace, "../../data/podinfo.yaml") + test.WaitForDeploymentReady(d, defaultTimeout) - }) + pods := test.ListPodsFromDeployment(d) + Expect(len(pods.Items)).To(Equal(2)) - Context("and delete the managed public nodegroup", func() { - It("should not return an error", func() { - cmd := params.EksctlDeleteCmd.WithArgs( - "nodegroup", - "--verbose", "4", - "--cluster", params.ClusterName, - newPublicNodeGroup, - ) - Expect(cmd).To(RunSuccessfully()) - }) - }) + // For each pod of the Deployment, check we receive a sensible response to a + // GET request on /version. + for _, pod := range pods.Items { + Expect(pod.Namespace).To(Equal(test.Namespace)) - Context("and delete the managed private nodegroup", func() { - It("should not return an error", func() { - cmd := params.EksctlDeleteCmd.WithArgs( - "nodegroup", - "--verbose", "4", - "--cluster", params.ClusterName, - newPrivateNodeGroup, - ) - Expect(cmd).To(RunSuccessfully()) - }) - }) + req := test.PodProxyGet(&pod, "", "/version") + fmt.Fprintf(GinkgoWriter, "url = %#v", req.URL()) + + var js map[string]interface{} + test.PodProxyGetJSON(&pod, "", "/version", &js) + + Expect(js).To(HaveKeyWithValue("version", "1.5.1")) + } }) - Context("and creating a nodegroup with taints", func() { - params.LogStacksEventsOnFailure() + It("should have functional DNS", func() { + d := test.CreateDaemonSetFromFile(test.Namespace, "../../data/test-dns.yaml") + test.WaitForDaemonSetReady(d, defaultTimeout) + { + ds, err := test.GetDaemonSet(test.Namespace, d.Name) + Expect(err).ShouldNot(HaveOccurred()) + fmt.Fprintf(GinkgoWriter, "ds.Status = %#v", ds.Status) + } + }) - It("should create nodegroups with taints applied", func() { - taints := []api.NodeGroupTaint{ - { - Key: "key1", - Value: "value1", - Effect: "NoSchedule", - }, - { - Key: "key2", - Effect: "NoSchedule", - }, - { - Key: "key3", - Value: "value2", - Effect: "NoExecute", - }, - } - clusterConfig := makeClusterConfig() - clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ - { - NodeGroupBase: &api.NodeGroupBase{ - Name: "taints", - }, - Taints: taints, - }, - } + It("should have access to HTTP(S) sites", func() { + d := test.CreateDaemonSetFromFile(test.Namespace, "../../data/test-http.yaml") + test.WaitForDaemonSetReady(d, defaultTimeout) + { + ds, err := test.GetDaemonSet(test.Namespace, d.Name) + Expect(err).ShouldNot(HaveOccurred()) + fmt.Fprintf(GinkgoWriter, "ds.Status = %#v", ds.Status) + } + }) + }) - cmd := params.EksctlCreateCmd. - WithArgs( - "nodegroup", - "--config-file", "-", - "--verbose", "4", - ). - WithoutArg("--region", params.Region). - WithStdin(clusterutils.Reader(clusterConfig)) - Expect(cmd).To(RunSuccessfully()) - - config, err := clientcmd.BuildConfigFromFlags("", params.KubeconfigPath) - Expect(err).NotTo(HaveOccurred()) - clientset, err := kubernetes.NewForConfig(config) - Expect(err).NotTo(HaveOccurred()) - - mapTaints := func(taints []api.NodeGroupTaint) []corev1.Taint { - var ret []corev1.Taint - for _, t := range taints { - ret = append(ret, corev1.Taint{ - Key: t.Key, - Value: t.Value, - Effect: t.Effect, - }) - } - return ret - } + Context("adding new managed nodegroups", func() { + params.LogStacksEventsOnFailure() + + It("supports a public nodegroup", func() { + By("creating it") + cmd := params.EksctlCreateCmd.WithArgs( + "nodegroup", + "--cluster", params.ClusterName, + "--nodes", "4", + "--managed", + "--instance-types", "t3a.xlarge", + publicNodeGroup, + ) + Expect(cmd).To(RunSuccessfully()) - tests.AssertNodeTaints(tests.ListNodes(clientset, "taints"), mapTaints(taints)) - }) + By("ensuring it is healthy") + checkNg(publicNodeGroup) + + By("deleting it") + cmd = params.EksctlDeleteCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + publicNodeGroup, + ) + Expect(cmd).To(RunSuccessfully()) + }) + + It("supports a private nodegroup", func() { + By("creating it") + cmd := params.EksctlCreateCmd.WithArgs( + "nodegroup", + "--cluster", params.ClusterName, + "--nodes", "2", + "--managed", + "--instance-types", "t3a.xlarge", + "--node-private-networking", + privateNodeGroup, + ) + Expect(cmd).To(RunSuccessfully()) + + By("ensuring it is healthy") + checkNg(privateNodeGroup) + + By("deleting it") + cmd = params.EksctlDeleteCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + privateNodeGroup, + ) + Expect(cmd).To(RunSuccessfully()) + }) + + It("supports a nodegroup with taints", func() { + taints := []api.NodeGroupTaint{ + { + Key: "key1", + Value: "value1", + Effect: "NoSchedule", + }, + { + Key: "key2", + Effect: "NoSchedule", + }, + { + Key: "key3", + Value: "value2", + Effect: "NoExecute", + }, + } + clusterConfig := makeClusterConfig() + clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Name: "taints", + }, + Taints: taints, + }, + } - // clean up - It("should not return an error when deleting nodegroups with taints applied", func() { - cmd := params.EksctlDeleteCmd.WithArgs( + By("creating it") + cmd := params.EksctlCreateCmd. + WithArgs( "nodegroup", + "--config-file", "-", "--verbose", "4", - "--cluster", params.ClusterName, - "taints", - ) - Expect(cmd).To(RunSuccessfully()) - }) + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) + Expect(cmd).To(RunSuccessfully()) + + By("ensuring it is healthy") + checkNg("taints") + + By("asserting node taints") + config, err := clientcmd.BuildConfigFromFlags("", params.KubeconfigPath) + Expect(err).NotTo(HaveOccurred()) + clientset, err := kubernetes.NewForConfig(config) + Expect(err).NotTo(HaveOccurred()) + + mapTaints := func(taints []api.NodeGroupTaint) []corev1.Taint { + var ret []corev1.Taint + for _, t := range taints { + ret = append(ret, corev1.Taint{ + Key: t.Key, + Value: t.Value, + Effect: t.Effect, + }) + } + return ret + } + tests.AssertNodeTaints(tests.ListNodes(clientset, "taints"), mapTaints(taints)) + + By("deleting it") + cmd = params.EksctlDeleteCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + "taints", + ) + Expect(cmd).To(RunSuccessfully()) }) - Context("and creating bottlerocket and ubuntu nodegroups", func() { - params.LogStacksEventsOnFailure() - - It("supports adding bottlerocket nodegroups with gpu nodes", func() { - clusterConfig := makeClusterConfig() - clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ - { - NodeGroupBase: &api.NodeGroupBase{ - Name: bottlerocketGPU, - VolumeSize: aws.Int(35), - AMIFamily: "Bottlerocket", - InstanceType: "g4dn.xlarge", - Bottlerocket: &api.NodeGroupBottlerocket{ - EnableAdminContainer: api.Enabled(), - Settings: &api.InlineDocument{ - "motd": "Bottlerocket is the future", - "network": map[string]string{ - "hostname": "custom-bottlerocket-host", - }, + It("supports a bottlerocket nodegroup with gpu nodes", func() { + clusterConfig := makeClusterConfig() + clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Name: bottlerocketGPUNodegroup, + VolumeSize: aws.Int(35), + AMIFamily: "Bottlerocket", + InstanceType: "g4dn.xlarge", + Bottlerocket: &api.NodeGroupBottlerocket{ + EnableAdminContainer: api.Enabled(), + Settings: &api.InlineDocument{ + "motd": "Bottlerocket is the future", + "network": map[string]string{ + "hostname": "custom-bottlerocket-host", }, }, }, }, - } + }, + } - cmd := params.EksctlCreateCmd. - WithArgs( - "nodegroup", - "--config-file", "-", - "--skip-outdated-addons-check", - "--verbose", "4", - ). - WithoutArg("--region", params.Region). - WithStdin(clusterutils.Reader(clusterConfig)) - - Expect(cmd).To(RunSuccessfully()) - }) + By("creating it") + cmd := params.EksctlCreateCmd. + WithArgs( + "nodegroup", + "--config-file", "-", + "--skip-outdated-addons-check", + "--verbose", "4", + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) + Expect(cmd).To(RunSuccessfully()) - It("supports adding bottlerocket and ubuntu nodegroups with additional volumes", func() { - clusterConfig := makeClusterConfig() - clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ - { - NodeGroupBase: &api.NodeGroupBase{ - Name: bottlerocketNodegroup, - VolumeSize: aws.Int(35), - AMIFamily: "Bottlerocket", - InstanceType: "t3a.xlarge", - Bottlerocket: &api.NodeGroupBottlerocket{ - EnableAdminContainer: api.Enabled(), - Settings: &api.InlineDocument{ - "motd": "Bottlerocket is the future", - "network": map[string]string{ - "hostname": "custom-bottlerocket-host", - }, - }, - }, - AdditionalVolumes: []*api.VolumeMapping{ - { - VolumeName: aws.String("/dev/sdb"), + By("ensuring it is healthy") + checkNg(bottlerocketGPUNodegroup) + }) + + It("supports bottlerocket and ubuntu nodegroups with additional volumes", func() { + clusterConfig := makeClusterConfig() + clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Name: bottlerocketNodegroup, + VolumeSize: aws.Int(35), + AMIFamily: "Bottlerocket", + InstanceType: "t3a.xlarge", + Bottlerocket: &api.NodeGroupBottlerocket{ + EnableAdminContainer: api.Enabled(), + Settings: &api.InlineDocument{ + "motd": "Bottlerocket is the future", + "network": map[string]string{ + "hostname": "custom-bottlerocket-host", }, }, }, - Taints: []api.NodeGroupTaint{ + AdditionalVolumes: []*api.VolumeMapping{ { - Key: "key2", - Value: "value2", - Effect: "PreferNoSchedule", + VolumeName: aws.String("/dev/sdb"), }, }, }, - { - NodeGroupBase: &api.NodeGroupBase{ - Name: ubuntuNodegroup, - VolumeSize: aws.Int(25), - AMIFamily: "Ubuntu2004", - InstanceType: "t3a.xlarge", + Taints: []api.NodeGroupTaint{ + { + Key: "key2", + Value: "value2", + Effect: "PreferNoSchedule", }, }, - } - - cmd := params.EksctlCreateCmd. - WithArgs( - "nodegroup", - "--config-file", "-", - "--verbose", "4", - ). - WithoutArg("--region", params.Region). - WithStdin(clusterutils.Reader(clusterConfig)) - - Expect(cmd).To(RunSuccessfully()) - - tests.AssertNodeVolumes(params.KubeconfigPath, params.Region, bottlerocketNodegroup, "/dev/sdb") - - By("correctly configuring the bottlerocket nodegroup") - kubeTest, err := kube.NewTest(params.KubeconfigPath) - Expect(err).NotTo(HaveOccurred()) - - nodeList := kubeTest.ListNodes(metav1.ListOptions{ - LabelSelector: fmt.Sprintf("%s=%s", "eks.amazonaws.com/nodegroup", bottlerocketNodegroup), - }) - Expect(nodeList.Items).NotTo(BeEmpty()) - for _, node := range nodeList.Items { - Expect(node.Status.NodeInfo.OSImage).To(ContainSubstring("Bottlerocket")) - // On k8s 1.26, --hostname-override flag is passed to kubelet to allow nodes to join the cluster. - // For further reference please see: https://github.com/bottlerocket-os/bottlerocket/pull/3033. - Expect(node.Labels["kubernetes.io/hostname"]).To(ContainSubstring(fmt.Sprintf("%s.compute.internal", params.Region))) - } - kubeTest.Close() - }) - }) - - It("should have created an EKS cluster and 5 CloudFormation stacks", func() { - awsSession := NewConfig(params.Region) + }, + { + NodeGroupBase: &api.NodeGroupBase{ + Name: ubuntuNodegroup, + VolumeSize: aws.Int(25), + AMIFamily: "Ubuntu2004", + InstanceType: "t3a.xlarge", + }, + }, + } - Expect(awsSession).To(HaveExistingCluster(params.ClusterName, string(ekstypes.ClusterStatusActive), params.Version)) + By("creating it") + cmd := params.EksctlCreateCmd. + WithArgs( + "nodegroup", + "--config-file", "-", + "--verbose", "4", + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-cluster", params.ClusterName))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, initialAl2Nodegroup))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, bottlerocketNodegroup))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, bottlerocketGPU))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, ubuntuNodegroup))) - }) + Expect(cmd).To(RunSuccessfully()) - It("should have created a valid kubectl config file", func() { - config, err := clientcmd.LoadFromFile(params.KubeconfigPath) - Expect(err).ShouldNot(HaveOccurred()) + By("ensuring they are healthy") + checkNg(bottlerocketNodegroup) + checkNg(ubuntuNodegroup) - err = clientcmd.ConfirmUsable(*config, "") - Expect(err).ShouldNot(HaveOccurred()) + By("asserting node volumes") + tests.AssertNodeVolumes(params.KubeconfigPath, params.Region, bottlerocketNodegroup, "/dev/sdb") - Expect(config.CurrentContext).To(ContainSubstring("eksctl")) - Expect(config.CurrentContext).To(ContainSubstring(params.ClusterName)) - Expect(config.CurrentContext).To(ContainSubstring(params.Region)) - }) + By("correctly configuring the bottlerocket nodegroup") + kubeTest, err := kube.NewTest(params.KubeconfigPath) + Expect(err).NotTo(HaveOccurred()) - Context("and listing clusters", func() { - It("should return the previously created cluster", func() { - cmd := params.EksctlGetCmd.WithArgs("clusters", "--all-regions") - Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring(params.ClusterName))) + nodeList := kubeTest.ListNodes(metav1.ListOptions{ + LabelSelector: fmt.Sprintf("%s=%s", "eks.amazonaws.com/nodegroup", bottlerocketNodegroup), }) + Expect(nodeList.Items).NotTo(BeEmpty()) + for _, node := range nodeList.Items { + Expect(node.Status.NodeInfo.OSImage).To(ContainSubstring("Bottlerocket")) + // On k8s 1.26 and greater, --hostname-override flag is passed to kubelet to allow nodes to join cluster. + // For further reference, please see: https://github.com/bottlerocket-os/bottlerocket/pull/3033 + Expect(node.Labels["kubernetes.io/hostname"]).To(ContainSubstring(fmt.Sprintf("%s.compute.internal", params.Region))) + } + kubeTest.Close() }) - Context("and checking the nodegroup health", func() { - It("should return healthy", func() { - checkNg := func(ngName string) { - cmd := params.EksctlUtilsCmd.WithArgs( - "nodegroup-health", - "--cluster", params.ClusterName, - "--name", ngName, - ) + It("supports a nodegroup with an update config", func() { + updateConfig := &api.NodeGroupUpdateConfig{ + MaxUnavailable: aws.Int(2), + } + clusterConfig := makeClusterConfig() + clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Name: updateConfigNodegroup, + }, + UpdateConfig: updateConfig, + }, + } - Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("active"))) - } + By("creating it") + cmd := params.EksctlCreateCmd. + WithArgs( + "nodegroup", + "--config-file", "-", + "--verbose", "4", + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) + Expect(cmd).To(RunSuccessfully()) - checkNg(initialAl2Nodegroup) - checkNg(bottlerocketNodegroup) - checkNg(ubuntuNodegroup) - }) - }) + By("ensuring it is healthy") + checkNg(updateConfigNodegroup) - Context("and scale the initial nodegroup", func() { - It("should not return an error", func() { - cmd := params.EksctlScaleNodeGroupCmd.WithArgs( - "--cluster", params.ClusterName, - "--nodes-min", "2", - "--nodes", "3", - "--nodes-max", "4", - "--name", initialAl2Nodegroup, - ) - Expect(cmd).To(RunSuccessfully()) + ctx := context.Background() + clusterProvider, err := eks.New(ctx, &api.ProviderConfig{Region: params.Region}, clusterConfig) + Expect(err).NotTo(HaveOccurred()) + ctl := clusterProvider.AWSProvider + out, err := ctl.EKS().DescribeNodegroup(ctx, &awseks.DescribeNodegroupInput{ + ClusterName: ¶ms.ClusterName, + NodegroupName: aws.String(updateConfigNodegroup), }) - }) - - Context("and creating a nodegroup with an update config", func() { - params.LogStacksEventsOnFailure() - - It("defining the UpdateConfig field in the cluster config", func() { - By("creating it") - updateConfig := &api.NodeGroupUpdateConfig{ - MaxUnavailable: aws.Int(2), - } - clusterConfig := makeClusterConfig() - clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ - { - NodeGroupBase: &api.NodeGroupBase{ - Name: "update-config-ng", - }, - UpdateConfig: updateConfig, - }, - } - cmd := params.EksctlCreateCmd. - WithArgs( - "nodegroup", - "--config-file", "-", - "--verbose", "4", - ). - WithoutArg("--region", params.Region). - WithStdin(clusterutils.Reader(clusterConfig)) - Expect(cmd).To(RunSuccessfully()) - - ctx := context.Background() - clusterProvider, err := eks.New(ctx, &api.ProviderConfig{Region: params.Region}, clusterConfig) - Expect(err).NotTo(HaveOccurred()) - ctl := clusterProvider.AWSProvider - out, err := ctl.EKS().DescribeNodegroup(ctx, &awseks.DescribeNodegroupInput{ - ClusterName: ¶ms.ClusterName, - NodegroupName: aws.String("update-config-ng"), - }) - Expect(err).NotTo(HaveOccurred()) - Eventually(out.Nodegroup.UpdateConfig.MaxUnavailable).Should(Equal(aws.Int32(2))) - - By("and updating the nodegroup's UpdateConfig") - clusterConfig.ManagedNodeGroups[0].Spot = true - clusterConfig.ManagedNodeGroups[0].UpdateConfig = &api.NodeGroupUpdateConfig{ - MaxUnavailable: aws.Int(1), - } + Expect(err).NotTo(HaveOccurred()) + Eventually(out.Nodegroup.UpdateConfig.MaxUnavailable).Should(Equal(aws.Int32(2))) - cmd = params.EksctlUpdateCmd. - WithArgs( - "nodegroup", - "--config-file", "-", - "--verbose", "4", - ). - WithoutArg("--region", params.Region). - WithStdin(clusterutils.Reader(clusterConfig)) - - Expect(cmd).To(RunSuccessfullyWithOutputStringLines( - ContainElement(ContainSubstring("unchanged fields for nodegroup update-config-ng: the following fields remain unchanged; they are not supported by `eksctl update nodegroup`: Spot")), - )) - - out, err = ctl.EKS().DescribeNodegroup(ctx, &awseks.DescribeNodegroupInput{ - ClusterName: ¶ms.ClusterName, - NodegroupName: aws.String("update-config-ng"), - }) - Expect(err).NotTo(HaveOccurred()) - Eventually(out.Nodegroup.UpdateConfig.MaxUnavailable).Should(Equal(aws.Int32(1))) - }) + By("updating the nodegroup's UpdateConfig") + clusterConfig.ManagedNodeGroups[0].Spot = true + clusterConfig.ManagedNodeGroups[0].UpdateConfig = &api.NodeGroupUpdateConfig{ + MaxUnavailable: aws.Int(1), + } - // clean up - It("should not return an error when deleting nodegroup with an update config", func() { - cmd := params.EksctlDeleteCmd.WithArgs( + cmd = params.EksctlUpdateCmd. + WithArgs( "nodegroup", + "--config-file", "-", "--verbose", "4", - "--cluster", params.ClusterName, - "update-config-ng", - ) - Expect(cmd).To(RunSuccessfully()) - }) - }) - - Context("and upgrading a nodegroup", func() { - params.LogStacksEventsOnFailure() - - It("should upgrade to the next Kubernetes version", func() { - By("updating the control plane version") - cmd := params.EksctlUpgradeCmd. - WithArgs( - "cluster", - "--verbose", "4", - "--name", params.ClusterName, - "--approve", - ) - Expect(cmd).To(RunSuccessfully()) - - var nextVersion string - { - supportedVersions := api.SupportedVersions() - nextVersion = supportedVersions[len(supportedVersions)-1] - } - By(fmt.Sprintf("checking that control plane is updated to %v", nextVersion)) - config, err := clientcmd.BuildConfigFromFlags("", params.KubeconfigPath) - Expect(err).NotTo(HaveOccurred()) - - clientset, err := kubernetes.NewForConfig(config) - Expect(err).NotTo(HaveOccurred()) - Eventually(func() string { - serverVersion, err := clientset.ServerVersion() - Expect(err).NotTo(HaveOccurred()) - return fmt.Sprintf("%s.%s", serverVersion.Major, strings.TrimSuffix(serverVersion.Minor, "+")) - }, k8sUpdatePollTimeout, k8sUpdatePollInterval).Should(Equal(nextVersion)) - - upgradeNg := func(ngName string) { - By(fmt.Sprintf("upgrading nodegroup %s to Kubernetes version %s", ngName, nextVersion)) - cmd = params.EksctlUpgradeCmd.WithArgs( - "nodegroup", - "--verbose", "4", - "--cluster", params.ClusterName, - "--name", ngName, - "--kubernetes-version", nextVersion, - "--timeout=60m", // wait for CF stacks to finish update - ) - ExpectWithOffset(1, cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("nodegroup successfully upgraded"))) - } - - upgradeNg(initialAl2Nodegroup) - upgradeNg(bottlerocketNodegroup) + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) + + msg := fmt.Sprintf("unchanged fields for nodegroup %s: the following fields remain unchanged; they are not supported by `eksctl update nodegroup`: Spot", updateConfigNodegroup) + Expect(cmd).To(RunSuccessfullyWithOutputStringLines( + ContainElement(ContainSubstring(msg)), + )) + + out, err = ctl.EKS().DescribeNodegroup(ctx, &awseks.DescribeNodegroupInput{ + ClusterName: ¶ms.ClusterName, + NodegroupName: aws.String(updateConfigNodegroup), }) + Expect(err).NotTo(HaveOccurred()) + Eventually(out.Nodegroup.UpdateConfig.MaxUnavailable).Should(Equal(aws.Int32(1))) }) + }) - Context("and deleting the cluster", func() { - It("should not return an error", func() { - cmd := params.EksctlDeleteClusterCmd.WithArgs( - "--name", params.ClusterName, - ) - Expect(cmd).To(RunSuccessfully()) - }) + Context("scaling the initial nodegroup", func() { + It("should not return an error", func() { + cmd := params.EksctlScaleNodeGroupCmd.WithArgs( + "--cluster", params.ClusterName, + "--nodes-min", "2", + "--nodes", "3", + "--nodes-max", "4", + "--name", initialAl2Nodegroup, + ) + Expect(cmd).To(RunSuccessfully()) }) }) }) -var _ = AfterSuite(func() { +var _ = SynchronizedAfterSuite(func() {}, func() { params.DeleteClusters() }) diff --git a/integration/tests/params.go b/integration/tests/params.go index f9841039c7..52989fb5b3 100644 --- a/integration/tests/params.go +++ b/integration/tests/params.go @@ -42,6 +42,7 @@ type Params struct { SkipDelete bool KubeconfigPath string GitopsOwner string + IsGitopsOwnerPersonal bool KubeconfigTemp bool TestDirectory string EksctlCmd runner.Cmd @@ -162,7 +163,11 @@ func (p *Params) GenerateCommands() { // adds the cluster to the list of clusters to eventually delete, once the test // suite has run. func (p *Params) NewClusterName(prefix string) string { - return p.formatClusterName(prefix, names.ForCluster("", "")) + return p.newClusterName(prefix, "") +} + +func (p *Params) newClusterName(prefix string, givenName string) string { + return p.formatClusterName(prefix, names.ForCluster(givenName, "")) } func (p *Params) formatClusterName(prefix string, name string) string { @@ -200,6 +205,10 @@ const ( // NewParams creates a new Test instance from CLI args, grouping all test parameters. func NewParams(clusterNamePrefix string) *Params { + return NewParamsWithGivenClusterName(clusterNamePrefix, "") +} + +func NewParamsWithGivenClusterName(clusterNamePrefix string, givenName string) *Params { params := Params{clusterNamePrefix: clusterNamePrefix} flag.StringVar(¶ms.EksctlPath, "eksctl.path", "../../../eksctl", "Path to eksctl") @@ -212,13 +221,14 @@ func NewParams(clusterNamePrefix string) *Params { flag.BoolVar(¶ms.SkipDelete, "eksctl.skip.delete", false, "Skip the cleanup after the tests have run") flag.StringVar(¶ms.KubeconfigPath, "eksctl.kubeconfig", "", "Path to kubeconfig (default: create a temporary file)") flag.StringVar(¶ms.GitopsOwner, "eksctl.owner", "", "User or org name to create gitops repo under") + flag.BoolVar(¶ms.IsGitopsOwnerPersonal, "eksctl.personal", false, "Whether the gitops repo is associated to an org or not") // go1.13+ testing flags regression fix: https://github.com/golang/go/issues/31859 flag.Parse() params.attemptSettingUserID() if params.ClusterName == "" { - params.ClusterName = params.NewClusterName(clusterNamePrefix) + params.ClusterName = params.newClusterName(clusterNamePrefix, givenName) } else { params.addToDeleteList(params.ClusterName) } @@ -244,6 +254,7 @@ func (p *Params) LogStacksEventsOnFailureForCluster(clusterName string) bool { "describe-stacks", "--cluster", clusterName, "--events", + "--resource-status", "CREATE_FAILED,DELETE_FAILED,UPDATE_FAILED,UPDATE_ROLLBACK_FAILED,ROLLBACK_FAILED", )).To(RunSuccessfully()) } }) @@ -261,7 +272,7 @@ func (p *Params) attemptSettingUserID() { }, }) - msg := "Warning: failed to get UserID, proceeding without configuring cluster name prefix. Error: %w" + msg := "Warning: failed to get UserID, proceeding without configuring cluster name prefix. Error: %v" if err != nil { fmt.Fprintf(GinkgoWriter, msg, err) return diff --git a/integration/tests/unowned_cluster/unowned_cluster_test.go b/integration/tests/unowned_cluster/unowned_cluster_test.go index 7dc0a38fa5..7f876529f5 100644 --- a/integration/tests/unowned_cluster/unowned_cluster_test.go +++ b/integration/tests/unowned_cluster/unowned_cluster_test.go @@ -47,8 +47,8 @@ func TestE2E(t *testing.T) { var ( stackName, ng1, mng1, mng2 string - version = "1.22" - upgradeVersion = "1.23" + version string + upgradeVersion string ctl api.ClusterProvider cfg *api.ClusterConfig ) @@ -58,6 +58,9 @@ var _ = BeforeSuite(func() { mng1 = "mng-1" mng2 = "mng-2" stackName = fmt.Sprintf("eksctl-%s", params.ClusterName) + + version, upgradeVersion = clusterutils.GetCurrentAndNextVersionsForUpgrade(params.Version) + cfg = &api.ClusterConfig{ TypeMeta: api.ClusterConfigTypeMeta(), Metadata: &api.ClusterMeta{ diff --git a/integration/tests/update/update_cluster_test.go b/integration/tests/update/update_cluster_test.go index 7fff4ad792..a05ca44f4e 100644 --- a/integration/tests/update/update_cluster_test.go +++ b/integration/tests/update/update_cluster_test.go @@ -23,6 +23,7 @@ import ( . "github.com/weaveworks/eksctl/integration/matchers" . "github.com/weaveworks/eksctl/integration/runner" "github.com/weaveworks/eksctl/integration/tests" + clusterutils "github.com/weaveworks/eksctl/integration/utilities/cluster" "github.com/weaveworks/eksctl/pkg/addons" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/eks" @@ -88,13 +89,7 @@ var _ = BeforeSuite(func() { fmt.Fprintf(GinkgoWriter, "Using kubeconfig: %s\n", params.KubeconfigPath) - supportedVersions := api.SupportedVersions() - if len(supportedVersions) < 2 { - Fail("Update cluster test requires at least two supported EKS versions") - } - - // Use the lowest supported version - eksVersion, nextEKSVersion = supportedVersions[0], supportedVersions[1] + eksVersion, nextEKSVersion = clusterutils.GetCurrentAndNextVersionsForUpgrade(params.Version) cmd := params.EksctlCreateCmd.WithArgs( "cluster", @@ -200,6 +195,17 @@ var _ = Describe("(Integration) Update addons", func() { Expect(cmd).To(RunSuccessfully()) }) + It("should upgrade the nodegroup to the next version", func() { + cmd := params.EksctlUpgradeCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + "--name", initNG, + "--kubernetes-version", nextEKSVersion, + "--timeout=60m", // wait for CF stacks to finish update + ) + ExpectWithOffset(1, cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("nodegroup successfully upgraded"))) + }) }) }) diff --git a/integration/tests/windows/windows_test.go b/integration/tests/windows/windows_test.go index 761285def4..eabc1cfe84 100644 --- a/integration/tests/windows/windows_test.go +++ b/integration/tests/windows/windows_test.go @@ -33,16 +33,16 @@ func TestWindowsCluster(t *testing.T) { var params *tests.Params var _ = BeforeSuite(func() { - params = tests.NewParams("windows") + params = tests.NewParams(fmt.Sprintf("windows-%d", GinkgoParallelProcess())) }) var _ = Describe("(Integration) [Windows Nodegroups]", func() { - createCluster := func(withOIDC bool, ami, containerRuntime, clusterName string) { + createCluster := func(withOIDC bool, ami, clusterName string) { By("creating a new cluster with Windows nodegroups") clusterConfig := api.NewClusterConfig() clusterConfig.Metadata.Name = clusterName - clusterConfig.Metadata.Version = api.Version1_23 + clusterConfig.Metadata.Version = api.LatestVersion clusterConfig.Metadata.Region = api.DefaultRegion clusterConfig.IAM.WithOIDC = &withOIDC @@ -54,7 +54,6 @@ var _ = Describe("(Integration) [Windows Nodegroups]", func() { VolumeSize: aws.Int(120), InstanceType: "t3a.xlarge", }, - ContainerRuntime: &containerRuntime, }, } clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ @@ -90,7 +89,7 @@ var _ = Describe("(Integration) [Windows Nodegroups]", func() { } deleteCluster := func(clusterName string) { - By("deleting the windows cluster") + By("deleting the Windows cluster") cmd := params.EksctlDeleteCmd.WithArgs( "cluster", "--name", clusterName, @@ -99,16 +98,14 @@ var _ = Describe("(Integration) [Windows Nodegroups]", func() { } Context("When creating a cluster with Windows nodegroups", func() { - DescribeTable("it should be able to run Windows pods", func(withOIDC bool, ami, workload, containerRuntime, clusterName string) { - createCluster(withOIDC, ami, containerRuntime, clusterName) + DescribeTable("it should be able to run Windows pods", func(withOIDC bool, ami, workload, clusterName string) { + createCluster(withOIDC, ami, clusterName) runWindowsPod(workload) deleteCluster(clusterName) }, - Entry("windows when withOIDC is disabled", false, api.NodeImageFamilyWindowsServer2019FullContainer, "windows-server-iis.yaml", api.ContainerRuntimeDockerForWindows, "windows-cluster1"), - Entry("windows when withOIDC is enabled", true, api.NodeImageFamilyWindowsServer2019FullContainer, "windows-server-iis.yaml", api.ContainerRuntimeDockerForWindows, "windows-cluster2"), - - Entry("Windows Server 2022 when withOIDC is enabled", true, api.NodeImageFamilyWindowsServer2022FullContainer, "windows-server-iis-2022.yaml", api.ContainerRuntimeDockerForWindows, "windows-cluster3"), - Entry("Windows Server 2022 with containerd", true, api.NodeImageFamilyWindowsServer2022FullContainer, "windows-server-iis-2022.yaml", api.ContainerRuntimeContainerD, "windows-cluster4"), + Entry("Windows when withOIDC is disabled", false, api.NodeImageFamilyWindowsServer2019FullContainer, "windows-server-iis.yaml", "windows-cluster1"), + Entry("Windows when withOIDC is enabled", true, api.NodeImageFamilyWindowsServer2019FullContainer, "windows-server-iis.yaml", "windows-cluster2"), + Entry("Windows Server 2022 when withOIDC is enabled", true, api.NodeImageFamilyWindowsServer2022FullContainer, "windows-server-iis-2022.yaml", "windows-cluster3"), ) }) diff --git a/integration/utilities/cluster/cluster.go b/integration/utilities/cluster/cluster.go index 6bcc9301dd..4ba9fe3c9f 100644 --- a/integration/utilities/cluster/cluster.go +++ b/integration/utilities/cluster/cluster.go @@ -6,7 +6,9 @@ import ( "io" "os" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "golang.org/x/exp/slices" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/eks" @@ -32,3 +34,24 @@ func ParseClusterConfig(clusterName, region, filename string) *api.ClusterConfig clusterConfig.Metadata.Region = region return clusterConfig } + +func GetCurrentAndNextVersionsForUpgrade(testVersion string) (currentVersion, nextVersion string) { + supportedVersions := api.SupportedVersions() + if len(supportedVersions) < 2 { + Fail("Upgrade test requires at least two supported EKS versions") + } + + // if latest version is used, fetch previous version to upgrade from + if testVersion == api.LatestVersion { + previousVersionIndex := slices.Index(supportedVersions, testVersion) - 1 + currentVersion = supportedVersions[previousVersionIndex] + nextVersion = testVersion + return + } + + // otherwise fetch next version to upgrade to + nextVersionIndex := slices.Index(supportedVersions, testVersion) + 1 + currentVersion = testVersion + nextVersion = supportedVersions[nextVersionIndex] + return +} diff --git a/integration/utilities/kube/kube.go b/integration/utilities/kube/kube.go index a2a961de84..7d2b42887d 100644 --- a/integration/utilities/kube/kube.go +++ b/integration/utilities/kube/kube.go @@ -4,12 +4,14 @@ package kube import ( + "fmt" + harness "github.com/dlespiau/kube-test-harness" "github.com/dlespiau/kube-test-harness/logger" "github.com/onsi/ginkgo/v2" ) -type tHelper struct{ ginkgo.GinkgoTInterface } +type tHelper struct{ ginkgo.FullGinkgoTInterface } func (t *tHelper) Helper() {} func (t *tHelper) Name() string { return "eksctl-test" } @@ -26,6 +28,7 @@ func NewTest(kubeconfigPath string) (*harness.Test, error) { return nil, err } test := h.NewTest(t) + test.Namespace += fmt.Sprintf("-%d", t.ParallelProcess()) test.Setup() return test, nil } diff --git a/pkg/actions/addon/addon.go b/pkg/actions/addon/addon.go index c4662eecae..006fce1a92 100644 --- a/pkg/actions/addon/addon.go +++ b/pkg/actions/addon/addon.go @@ -7,6 +7,7 @@ import ( "strings" "time" + cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" "github.com/aws/aws-sdk-go-v2/service/eks" "github.com/hashicorp/go-version" "github.com/kris-nova/logger" @@ -14,20 +15,34 @@ import ( api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/awsapi" + "github.com/weaveworks/eksctl/pkg/cfn/builder" "github.com/weaveworks/eksctl/pkg/cfn/manager" iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc" ) +// StackManager manages CloudFormation stacks for addons. +// +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//counterfeiter:generate -o fakes/fake_stack_manager.go . StackManager +type StackManager interface { + CreateStack(ctx context.Context, name string, stack builder.ResourceSetReader, tags, parameters map[string]string, errs chan error) error + DeleteStackBySpec(ctx context.Context, s *cfntypes.Stack) (*cfntypes.Stack, error) + DeleteStackBySpecSync(ctx context.Context, s *cfntypes.Stack, errs chan error) error + DescribeStack(ctx context.Context, i *cfntypes.Stack) (*cfntypes.Stack, error) + GetIAMAddonsStacks(ctx context.Context) ([]*cfntypes.Stack, error) + UpdateStack(ctx context.Context, options manager.UpdateStackOptions) error +} + type Manager struct { clusterConfig *api.ClusterConfig eksAPI awsapi.EKS withOIDC bool oidcManager *iamoidc.OpenIDConnectManager - stackManager manager.StackManager + stackManager StackManager clientSet kubeclient.Interface } -func New(clusterConfig *api.ClusterConfig, eksAPI awsapi.EKS, stackManager manager.StackManager, withOIDC bool, oidcManager *iamoidc.OpenIDConnectManager, clientSet kubeclient.Interface) (*Manager, error) { +func New(clusterConfig *api.ClusterConfig, eksAPI awsapi.EKS, stackManager StackManager, withOIDC bool, oidcManager *iamoidc.OpenIDConnectManager, clientSet kubeclient.Interface) (*Manager, error) { return &Manager{ clusterConfig: clusterConfig, eksAPI: eksAPI, @@ -39,9 +54,12 @@ func New(clusterConfig *api.ClusterConfig, eksAPI awsapi.EKS, stackManager manag } func (a *Manager) waitForAddonToBeActive(ctx context.Context, addon *api.Addon, waitTimeout time.Duration) error { - // Don't wait for coredns or aws-ebs-csi-driver if there are no nodegroups. + // Don't wait for coredns, aws-ebs-csi-driver or aws-efs-csi-driver if there are no nodegroups. // They will be in degraded state until nodegroups are added. - if (addon.Name == api.CoreDNSAddon || addon.Name == api.AWSEBSCSIDriverAddon) && !a.clusterConfig.HasNodes() { + if (addon.Name == api.CoreDNSAddon || + addon.Name == api.AWSEBSCSIDriverAddon || + addon.Name == api.AWSEFSCSIDriverAddon) && + !a.clusterConfig.HasNodes() { return nil } activeWaiter := eks.NewAddonActiveWaiter(a.eksAPI) diff --git a/pkg/actions/addon/create.go b/pkg/actions/addon/create.go index d570cb6a62..2d6bd8c23e 100644 --- a/pkg/actions/addon/create.go +++ b/pkg/actions/addon/create.go @@ -251,13 +251,17 @@ func (a *Manager) getRecommendedPolicies(addon *api.Addon) (api.InlineDocument, switch addon.CanonicalName() { case api.VPCCNIAddon: if a.clusterConfig.IPv6Enabled() { - return makeIPv6VPCCNIPolicyDocument(api.Partition(a.clusterConfig.Metadata.Region)), nil, nil + return makeIPv6VPCCNIPolicyDocument(api.Partitions.ForRegion(a.clusterConfig.Metadata.Region)), nil, nil } - return nil, []string{fmt.Sprintf("arn:%s:iam::aws:policy/%s", api.Partition(a.clusterConfig.Metadata.Region), api.IAMPolicyAmazonEKSCNIPolicy)}, nil + return nil, []string{fmt.Sprintf("arn:%s:iam::aws:policy/%s", api.Partitions.ForRegion(a.clusterConfig.Metadata.Region), api.IAMPolicyAmazonEKSCNIPolicy)}, nil case api.AWSEBSCSIDriverAddon: return nil, nil, &api.WellKnownPolicies{ EBSCSIController: true, } + case api.AWSEFSCSIDriverAddon: + return nil, nil, &api.WellKnownPolicies{ + EFSCSIController: true, + } default: return nil, nil, nil } diff --git a/pkg/actions/addon/create_test.go b/pkg/actions/addon/create_test.go index 7fd880a034..688e13580c 100644 --- a/pkg/actions/addon/create_test.go +++ b/pkg/actions/addon/create_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/weaveworks/eksctl/pkg/actions/addon" + "github.com/weaveworks/eksctl/pkg/actions/addon/fakes" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/builder" - "github.com/weaveworks/eksctl/pkg/cfn/manager/fakes" iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc" "github.com/weaveworks/eksctl/pkg/testutils" "github.com/weaveworks/eksctl/pkg/testutils/mockprovider" @@ -381,7 +381,7 @@ var _ = Describe("Create", func() { } }) - DescribeTable("addons created with a waitTimeout", func(e createAddonEntry) { + DescribeTable("addons created with a waitTimeout when there are no active nodes", func(e createAddonEntry) { expectedDescribeCallsCount := 1 if e.shouldWait { expectedDescribeCallsCount++ @@ -404,6 +404,9 @@ var _ = Describe("Create", func() { Entry("should not wait for Amazon EBS CSI driver to become active", createAddonEntry{ addonName: api.AWSEBSCSIDriverAddon, }), + Entry("should not wait for Amazon EFS CSI driver to become active", createAddonEntry{ + addonName: api.AWSEFSCSIDriverAddon, + }), Entry("should wait for VPC CNI to become active", createAddonEntry{ addonName: api.VPCCNIAddon, shouldWait: true, @@ -630,6 +633,31 @@ var _ = Describe("Create", func() { Expect(*createAddonInput.ServiceAccountRoleArn).To(Equal("role-arn")) }) }) + + When("it's the aws-efs-csi-driver addon", func() { + It("creates a role with the recommended policies and attaches it to the addon", func() { + err := manager.Create(context.Background(), &api.Addon{ + Name: api.AWSEFSCSIDriverAddon, + Version: "v1.0.0-eksbuild.1", + }, 0) + Expect(err).NotTo(HaveOccurred()) + + Expect(fakeStackManager.CreateStackCallCount()).To(Equal(1)) + _, name, resourceSet, tags, _, _ := fakeStackManager.CreateStackArgsForCall(0) + Expect(name).To(Equal("eksctl-my-cluster-addon-aws-efs-csi-driver")) + Expect(resourceSet).NotTo(BeNil()) + Expect(tags).To(Equal(map[string]string{ + api.AddonNameTag: api.AWSEFSCSIDriverAddon, + })) + output, err := resourceSet.RenderJSON() + Expect(err).NotTo(HaveOccurred()) + Expect(string(output)).To(ContainSubstring("PolicyEFSCSIController")) + Expect(*createAddonInput.ClusterName).To(Equal("my-cluster")) + Expect(*createAddonInput.AddonName).To(Equal(api.AWSEFSCSIDriverAddon)) + Expect(*createAddonInput.AddonVersion).To(Equal("v1.0.0-eksbuild.1")) + Expect(*createAddonInput.ServiceAccountRoleArn).To(Equal("role-arn")) + }) + }) }) }) diff --git a/pkg/actions/addon/delete.go b/pkg/actions/addon/delete.go index 245ab3bd02..c66d0cf584 100644 --- a/pkg/actions/addon/delete.go +++ b/pkg/actions/addon/delete.go @@ -12,6 +12,7 @@ import ( api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/manager" + "github.com/weaveworks/eksctl/pkg/utils/tasks" ) func (a *Manager) DeleteWithPreserve(ctx context.Context, addon *api.Addon) error { @@ -69,3 +70,31 @@ func (a *Manager) deleteAddon(ctx context.Context, addon *api.Addon, preserve bo } return true, nil } + +type Remover struct { + stackManager StackManager +} + +func NewRemover(stackManager StackManager) *Remover { + return &Remover{ + stackManager: stackManager, + } +} + +func (ar *Remover) DeleteAddonIAMTasks(ctx context.Context, wait bool) (*tasks.TaskTree, error) { + stacks, err := ar.stackManager.GetIAMAddonsStacks(ctx) + if err != nil { + return nil, fmt.Errorf("failed to fetch addons stacks: %v", err) + } + taskTree := &tasks.TaskTree{Parallel: true} + for _, s := range stacks { + taskTree.Append(&deleteAddonIAMTask{ + ctx: ctx, + info: fmt.Sprintf("delete addon IAM %q", *s.StackName), + stack: s, + stackManager: ar.stackManager, + wait: wait, + }) + } + return taskTree, nil +} diff --git a/pkg/actions/addon/delete_test.go b/pkg/actions/addon/delete_test.go index a1e8581de4..c099a9b6dc 100644 --- a/pkg/actions/addon/delete_test.go +++ b/pkg/actions/addon/delete_test.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/errors" "github.com/weaveworks/eksctl/pkg/actions/addon" + "github.com/weaveworks/eksctl/pkg/actions/addon/fakes" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" - "github.com/weaveworks/eksctl/pkg/cfn/manager/fakes" "github.com/weaveworks/eksctl/pkg/testutils/mockprovider" ) @@ -223,4 +223,39 @@ var _ = Describe("Delete", func() { }) }) }) + + Describe("DeleteAddonIAMTasks", func() { + var ( + ar *addon.Remover + ) + BeforeEach(func() { + fakeStackManager = new(fakes.FakeStackManager) + ar = addon.NewRemover(fakeStackManager) + }) + + When("it fails to fetch addons stacks", func() { + It("returns an error", func() { + fakeStackManager.GetIAMAddonsStacksReturns(nil, fmt.Errorf("foo")) + _, err := ar.DeleteAddonIAMTasks(context.Background(), false) + Expect(err).To(MatchError(ContainSubstring("failed to fetch addons stacks"))) + }) + }) + + When("there are multiple addons stacks", func() { + It("returns a tasktree with all expected tasks", func() { + fakeStackManager.GetIAMAddonsStacksReturns([]*types.Stack{ + { + StackName: aws.String("eksctl-it-cluster-addon-vpc-cni"), + }, + { + StackName: aws.String("eksctl-it-cluster-addon-coredns"), + }, + }, nil) + taskTree, err := ar.DeleteAddonIAMTasks(context.Background(), false) + Expect(err).NotTo(HaveOccurred()) + Expect(taskTree.Parallel).To(Equal(true)) + Expect(len(taskTree.Tasks)).To(Equal(2)) + }) + }) + }) }) diff --git a/pkg/actions/addon/fakes/fake_stack_manager.go b/pkg/actions/addon/fakes/fake_stack_manager.go new file mode 100644 index 0000000000..10d8493d0f --- /dev/null +++ b/pkg/actions/addon/fakes/fake_stack_manager.go @@ -0,0 +1,520 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package fakes + +import ( + "context" + "sync" + + "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" + "github.com/weaveworks/eksctl/pkg/actions/addon" + "github.com/weaveworks/eksctl/pkg/cfn/builder" + "github.com/weaveworks/eksctl/pkg/cfn/manager" +) + +type FakeStackManager struct { + CreateStackStub func(context.Context, string, builder.ResourceSetReader, map[string]string, map[string]string, chan error) error + createStackMutex sync.RWMutex + createStackArgsForCall []struct { + arg1 context.Context + arg2 string + arg3 builder.ResourceSetReader + arg4 map[string]string + arg5 map[string]string + arg6 chan error + } + createStackReturns struct { + result1 error + } + createStackReturnsOnCall map[int]struct { + result1 error + } + DeleteStackBySpecStub func(context.Context, *types.Stack) (*types.Stack, error) + deleteStackBySpecMutex sync.RWMutex + deleteStackBySpecArgsForCall []struct { + arg1 context.Context + arg2 *types.Stack + } + deleteStackBySpecReturns struct { + result1 *types.Stack + result2 error + } + deleteStackBySpecReturnsOnCall map[int]struct { + result1 *types.Stack + result2 error + } + DeleteStackBySpecSyncStub func(context.Context, *types.Stack, chan error) error + deleteStackBySpecSyncMutex sync.RWMutex + deleteStackBySpecSyncArgsForCall []struct { + arg1 context.Context + arg2 *types.Stack + arg3 chan error + } + deleteStackBySpecSyncReturns struct { + result1 error + } + deleteStackBySpecSyncReturnsOnCall map[int]struct { + result1 error + } + DescribeStackStub func(context.Context, *types.Stack) (*types.Stack, error) + describeStackMutex sync.RWMutex + describeStackArgsForCall []struct { + arg1 context.Context + arg2 *types.Stack + } + describeStackReturns struct { + result1 *types.Stack + result2 error + } + describeStackReturnsOnCall map[int]struct { + result1 *types.Stack + result2 error + } + GetIAMAddonsStacksStub func(context.Context) ([]*types.Stack, error) + getIAMAddonsStacksMutex sync.RWMutex + getIAMAddonsStacksArgsForCall []struct { + arg1 context.Context + } + getIAMAddonsStacksReturns struct { + result1 []*types.Stack + result2 error + } + getIAMAddonsStacksReturnsOnCall map[int]struct { + result1 []*types.Stack + result2 error + } + UpdateStackStub func(context.Context, manager.UpdateStackOptions) error + updateStackMutex sync.RWMutex + updateStackArgsForCall []struct { + arg1 context.Context + arg2 manager.UpdateStackOptions + } + updateStackReturns struct { + result1 error + } + updateStackReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeStackManager) CreateStack(arg1 context.Context, arg2 string, arg3 builder.ResourceSetReader, arg4 map[string]string, arg5 map[string]string, arg6 chan error) error { + fake.createStackMutex.Lock() + ret, specificReturn := fake.createStackReturnsOnCall[len(fake.createStackArgsForCall)] + fake.createStackArgsForCall = append(fake.createStackArgsForCall, struct { + arg1 context.Context + arg2 string + arg3 builder.ResourceSetReader + arg4 map[string]string + arg5 map[string]string + arg6 chan error + }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.CreateStackStub + fakeReturns := fake.createStackReturns + fake.recordInvocation("CreateStack", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) + fake.createStackMutex.Unlock() + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeStackManager) CreateStackCallCount() int { + fake.createStackMutex.RLock() + defer fake.createStackMutex.RUnlock() + return len(fake.createStackArgsForCall) +} + +func (fake *FakeStackManager) CreateStackCalls(stub func(context.Context, string, builder.ResourceSetReader, map[string]string, map[string]string, chan error) error) { + fake.createStackMutex.Lock() + defer fake.createStackMutex.Unlock() + fake.CreateStackStub = stub +} + +func (fake *FakeStackManager) CreateStackArgsForCall(i int) (context.Context, string, builder.ResourceSetReader, map[string]string, map[string]string, chan error) { + fake.createStackMutex.RLock() + defer fake.createStackMutex.RUnlock() + argsForCall := fake.createStackArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4, argsForCall.arg5, argsForCall.arg6 +} + +func (fake *FakeStackManager) CreateStackReturns(result1 error) { + fake.createStackMutex.Lock() + defer fake.createStackMutex.Unlock() + fake.CreateStackStub = nil + fake.createStackReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeStackManager) CreateStackReturnsOnCall(i int, result1 error) { + fake.createStackMutex.Lock() + defer fake.createStackMutex.Unlock() + fake.CreateStackStub = nil + if fake.createStackReturnsOnCall == nil { + fake.createStackReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.createStackReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeStackManager) DeleteStackBySpec(arg1 context.Context, arg2 *types.Stack) (*types.Stack, error) { + fake.deleteStackBySpecMutex.Lock() + ret, specificReturn := fake.deleteStackBySpecReturnsOnCall[len(fake.deleteStackBySpecArgsForCall)] + fake.deleteStackBySpecArgsForCall = append(fake.deleteStackBySpecArgsForCall, struct { + arg1 context.Context + arg2 *types.Stack + }{arg1, arg2}) + stub := fake.DeleteStackBySpecStub + fakeReturns := fake.deleteStackBySpecReturns + fake.recordInvocation("DeleteStackBySpec", []interface{}{arg1, arg2}) + fake.deleteStackBySpecMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeStackManager) DeleteStackBySpecCallCount() int { + fake.deleteStackBySpecMutex.RLock() + defer fake.deleteStackBySpecMutex.RUnlock() + return len(fake.deleteStackBySpecArgsForCall) +} + +func (fake *FakeStackManager) DeleteStackBySpecCalls(stub func(context.Context, *types.Stack) (*types.Stack, error)) { + fake.deleteStackBySpecMutex.Lock() + defer fake.deleteStackBySpecMutex.Unlock() + fake.DeleteStackBySpecStub = stub +} + +func (fake *FakeStackManager) DeleteStackBySpecArgsForCall(i int) (context.Context, *types.Stack) { + fake.deleteStackBySpecMutex.RLock() + defer fake.deleteStackBySpecMutex.RUnlock() + argsForCall := fake.deleteStackBySpecArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeStackManager) DeleteStackBySpecReturns(result1 *types.Stack, result2 error) { + fake.deleteStackBySpecMutex.Lock() + defer fake.deleteStackBySpecMutex.Unlock() + fake.DeleteStackBySpecStub = nil + fake.deleteStackBySpecReturns = struct { + result1 *types.Stack + result2 error + }{result1, result2} +} + +func (fake *FakeStackManager) DeleteStackBySpecReturnsOnCall(i int, result1 *types.Stack, result2 error) { + fake.deleteStackBySpecMutex.Lock() + defer fake.deleteStackBySpecMutex.Unlock() + fake.DeleteStackBySpecStub = nil + if fake.deleteStackBySpecReturnsOnCall == nil { + fake.deleteStackBySpecReturnsOnCall = make(map[int]struct { + result1 *types.Stack + result2 error + }) + } + fake.deleteStackBySpecReturnsOnCall[i] = struct { + result1 *types.Stack + result2 error + }{result1, result2} +} + +func (fake *FakeStackManager) DeleteStackBySpecSync(arg1 context.Context, arg2 *types.Stack, arg3 chan error) error { + fake.deleteStackBySpecSyncMutex.Lock() + ret, specificReturn := fake.deleteStackBySpecSyncReturnsOnCall[len(fake.deleteStackBySpecSyncArgsForCall)] + fake.deleteStackBySpecSyncArgsForCall = append(fake.deleteStackBySpecSyncArgsForCall, struct { + arg1 context.Context + arg2 *types.Stack + arg3 chan error + }{arg1, arg2, arg3}) + stub := fake.DeleteStackBySpecSyncStub + fakeReturns := fake.deleteStackBySpecSyncReturns + fake.recordInvocation("DeleteStackBySpecSync", []interface{}{arg1, arg2, arg3}) + fake.deleteStackBySpecSyncMutex.Unlock() + if stub != nil { + return stub(arg1, arg2, arg3) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeStackManager) DeleteStackBySpecSyncCallCount() int { + fake.deleteStackBySpecSyncMutex.RLock() + defer fake.deleteStackBySpecSyncMutex.RUnlock() + return len(fake.deleteStackBySpecSyncArgsForCall) +} + +func (fake *FakeStackManager) DeleteStackBySpecSyncCalls(stub func(context.Context, *types.Stack, chan error) error) { + fake.deleteStackBySpecSyncMutex.Lock() + defer fake.deleteStackBySpecSyncMutex.Unlock() + fake.DeleteStackBySpecSyncStub = stub +} + +func (fake *FakeStackManager) DeleteStackBySpecSyncArgsForCall(i int) (context.Context, *types.Stack, chan error) { + fake.deleteStackBySpecSyncMutex.RLock() + defer fake.deleteStackBySpecSyncMutex.RUnlock() + argsForCall := fake.deleteStackBySpecSyncArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3 +} + +func (fake *FakeStackManager) DeleteStackBySpecSyncReturns(result1 error) { + fake.deleteStackBySpecSyncMutex.Lock() + defer fake.deleteStackBySpecSyncMutex.Unlock() + fake.DeleteStackBySpecSyncStub = nil + fake.deleteStackBySpecSyncReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeStackManager) DeleteStackBySpecSyncReturnsOnCall(i int, result1 error) { + fake.deleteStackBySpecSyncMutex.Lock() + defer fake.deleteStackBySpecSyncMutex.Unlock() + fake.DeleteStackBySpecSyncStub = nil + if fake.deleteStackBySpecSyncReturnsOnCall == nil { + fake.deleteStackBySpecSyncReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.deleteStackBySpecSyncReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeStackManager) DescribeStack(arg1 context.Context, arg2 *types.Stack) (*types.Stack, error) { + fake.describeStackMutex.Lock() + ret, specificReturn := fake.describeStackReturnsOnCall[len(fake.describeStackArgsForCall)] + fake.describeStackArgsForCall = append(fake.describeStackArgsForCall, struct { + arg1 context.Context + arg2 *types.Stack + }{arg1, arg2}) + stub := fake.DescribeStackStub + fakeReturns := fake.describeStackReturns + fake.recordInvocation("DescribeStack", []interface{}{arg1, arg2}) + fake.describeStackMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeStackManager) DescribeStackCallCount() int { + fake.describeStackMutex.RLock() + defer fake.describeStackMutex.RUnlock() + return len(fake.describeStackArgsForCall) +} + +func (fake *FakeStackManager) DescribeStackCalls(stub func(context.Context, *types.Stack) (*types.Stack, error)) { + fake.describeStackMutex.Lock() + defer fake.describeStackMutex.Unlock() + fake.DescribeStackStub = stub +} + +func (fake *FakeStackManager) DescribeStackArgsForCall(i int) (context.Context, *types.Stack) { + fake.describeStackMutex.RLock() + defer fake.describeStackMutex.RUnlock() + argsForCall := fake.describeStackArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeStackManager) DescribeStackReturns(result1 *types.Stack, result2 error) { + fake.describeStackMutex.Lock() + defer fake.describeStackMutex.Unlock() + fake.DescribeStackStub = nil + fake.describeStackReturns = struct { + result1 *types.Stack + result2 error + }{result1, result2} +} + +func (fake *FakeStackManager) DescribeStackReturnsOnCall(i int, result1 *types.Stack, result2 error) { + fake.describeStackMutex.Lock() + defer fake.describeStackMutex.Unlock() + fake.DescribeStackStub = nil + if fake.describeStackReturnsOnCall == nil { + fake.describeStackReturnsOnCall = make(map[int]struct { + result1 *types.Stack + result2 error + }) + } + fake.describeStackReturnsOnCall[i] = struct { + result1 *types.Stack + result2 error + }{result1, result2} +} + +func (fake *FakeStackManager) GetIAMAddonsStacks(arg1 context.Context) ([]*types.Stack, error) { + fake.getIAMAddonsStacksMutex.Lock() + ret, specificReturn := fake.getIAMAddonsStacksReturnsOnCall[len(fake.getIAMAddonsStacksArgsForCall)] + fake.getIAMAddonsStacksArgsForCall = append(fake.getIAMAddonsStacksArgsForCall, struct { + arg1 context.Context + }{arg1}) + stub := fake.GetIAMAddonsStacksStub + fakeReturns := fake.getIAMAddonsStacksReturns + fake.recordInvocation("GetIAMAddonsStacks", []interface{}{arg1}) + fake.getIAMAddonsStacksMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeStackManager) GetIAMAddonsStacksCallCount() int { + fake.getIAMAddonsStacksMutex.RLock() + defer fake.getIAMAddonsStacksMutex.RUnlock() + return len(fake.getIAMAddonsStacksArgsForCall) +} + +func (fake *FakeStackManager) GetIAMAddonsStacksCalls(stub func(context.Context) ([]*types.Stack, error)) { + fake.getIAMAddonsStacksMutex.Lock() + defer fake.getIAMAddonsStacksMutex.Unlock() + fake.GetIAMAddonsStacksStub = stub +} + +func (fake *FakeStackManager) GetIAMAddonsStacksArgsForCall(i int) context.Context { + fake.getIAMAddonsStacksMutex.RLock() + defer fake.getIAMAddonsStacksMutex.RUnlock() + argsForCall := fake.getIAMAddonsStacksArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeStackManager) GetIAMAddonsStacksReturns(result1 []*types.Stack, result2 error) { + fake.getIAMAddonsStacksMutex.Lock() + defer fake.getIAMAddonsStacksMutex.Unlock() + fake.GetIAMAddonsStacksStub = nil + fake.getIAMAddonsStacksReturns = struct { + result1 []*types.Stack + result2 error + }{result1, result2} +} + +func (fake *FakeStackManager) GetIAMAddonsStacksReturnsOnCall(i int, result1 []*types.Stack, result2 error) { + fake.getIAMAddonsStacksMutex.Lock() + defer fake.getIAMAddonsStacksMutex.Unlock() + fake.GetIAMAddonsStacksStub = nil + if fake.getIAMAddonsStacksReturnsOnCall == nil { + fake.getIAMAddonsStacksReturnsOnCall = make(map[int]struct { + result1 []*types.Stack + result2 error + }) + } + fake.getIAMAddonsStacksReturnsOnCall[i] = struct { + result1 []*types.Stack + result2 error + }{result1, result2} +} + +func (fake *FakeStackManager) UpdateStack(arg1 context.Context, arg2 manager.UpdateStackOptions) error { + fake.updateStackMutex.Lock() + ret, specificReturn := fake.updateStackReturnsOnCall[len(fake.updateStackArgsForCall)] + fake.updateStackArgsForCall = append(fake.updateStackArgsForCall, struct { + arg1 context.Context + arg2 manager.UpdateStackOptions + }{arg1, arg2}) + stub := fake.UpdateStackStub + fakeReturns := fake.updateStackReturns + fake.recordInvocation("UpdateStack", []interface{}{arg1, arg2}) + fake.updateStackMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeStackManager) UpdateStackCallCount() int { + fake.updateStackMutex.RLock() + defer fake.updateStackMutex.RUnlock() + return len(fake.updateStackArgsForCall) +} + +func (fake *FakeStackManager) UpdateStackCalls(stub func(context.Context, manager.UpdateStackOptions) error) { + fake.updateStackMutex.Lock() + defer fake.updateStackMutex.Unlock() + fake.UpdateStackStub = stub +} + +func (fake *FakeStackManager) UpdateStackArgsForCall(i int) (context.Context, manager.UpdateStackOptions) { + fake.updateStackMutex.RLock() + defer fake.updateStackMutex.RUnlock() + argsForCall := fake.updateStackArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeStackManager) UpdateStackReturns(result1 error) { + fake.updateStackMutex.Lock() + defer fake.updateStackMutex.Unlock() + fake.UpdateStackStub = nil + fake.updateStackReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeStackManager) UpdateStackReturnsOnCall(i int, result1 error) { + fake.updateStackMutex.Lock() + defer fake.updateStackMutex.Unlock() + fake.UpdateStackStub = nil + if fake.updateStackReturnsOnCall == nil { + fake.updateStackReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.updateStackReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeStackManager) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.createStackMutex.RLock() + defer fake.createStackMutex.RUnlock() + fake.deleteStackBySpecMutex.RLock() + defer fake.deleteStackBySpecMutex.RUnlock() + fake.deleteStackBySpecSyncMutex.RLock() + defer fake.deleteStackBySpecSyncMutex.RUnlock() + fake.describeStackMutex.RLock() + defer fake.describeStackMutex.RUnlock() + fake.getIAMAddonsStacksMutex.RLock() + defer fake.getIAMAddonsStacksMutex.RUnlock() + fake.updateStackMutex.RLock() + defer fake.updateStackMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeStackManager) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ addon.StackManager = new(FakeStackManager) diff --git a/pkg/actions/addon/tasks.go b/pkg/actions/addon/tasks.go index bcf5ff0d4b..d81837335a 100644 --- a/pkg/actions/addon/tasks.go +++ b/pkg/actions/addon/tasks.go @@ -2,9 +2,11 @@ package addon import ( "context" + "fmt" "strings" "time" + cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/eks" "github.com/weaveworks/eksctl/pkg/utils/tasks" @@ -105,3 +107,29 @@ func (t *createAddonTask) Do(errorCh chan error) error { }() return nil } + +type deleteAddonIAMTask struct { + ctx context.Context + info string + stack *cfntypes.Stack + stackManager StackManager + wait bool +} + +func (t *deleteAddonIAMTask) Describe() string { return t.info } + +func (t *deleteAddonIAMTask) Do(errorCh chan error) error { + defer close(errorCh) + + errMsg := fmt.Sprintf("deleting addon IAM %q", *t.stack.StackName) + if t.wait { + if err := t.stackManager.DeleteStackBySpecSync(t.ctx, t.stack, errorCh); err != nil { + return fmt.Errorf("%s: %w", errMsg, err) + } + return nil + } + if _, err := t.stackManager.DeleteStackBySpec(t.ctx, t.stack); err != nil { + return fmt.Errorf("%s: %w", errMsg, err) + } + return nil +} diff --git a/pkg/actions/addon/update_test.go b/pkg/actions/addon/update_test.go index 4fe8a7fa85..b0f4feb892 100644 --- a/pkg/actions/addon/update_test.go +++ b/pkg/actions/addon/update_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/weaveworks/eksctl/pkg/actions/addon" + "github.com/weaveworks/eksctl/pkg/actions/addon/fakes" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/builder" "github.com/weaveworks/eksctl/pkg/cfn/manager" - "github.com/weaveworks/eksctl/pkg/cfn/manager/fakes" "github.com/weaveworks/eksctl/pkg/cfn/outputs" iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc" "github.com/weaveworks/eksctl/pkg/testutils/mockprovider" diff --git a/pkg/actions/cluster/cluster.go b/pkg/actions/cluster/cluster.go index affb98c441..5eb0c3b60b 100644 --- a/pkg/actions/cluster/cluster.go +++ b/pkg/actions/cluster/cluster.go @@ -37,7 +37,7 @@ func New(ctx context.Context, cfg *api.ClusterConfig, ctl *eks.ClusterProvider) if clusterStack != nil { logger.Debug("cluster %q was created by eksctl", cfg.Metadata.Name) - return NewOwnedCluster(cfg, ctl, clusterStack, stackManager), nil + return NewOwnedCluster(ctx, cfg, ctl, clusterStack, stackManager) } if !clusterExists { @@ -46,5 +46,5 @@ func New(ctx context.Context, cfg *api.ClusterConfig, ctl *eks.ClusterProvider) logger.Debug("cluster %q was not created by eksctl", cfg.Metadata.Name) - return NewUnownedCluster(cfg, ctl, stackManager), nil + return NewUnownedCluster(ctx, cfg, ctl, stackManager) } diff --git a/pkg/actions/cluster/delete.go b/pkg/actions/cluster/delete.go index 0166ce09f7..d3e247d5f7 100644 --- a/pkg/actions/cluster/delete.go +++ b/pkg/actions/cluster/delete.go @@ -219,6 +219,6 @@ func attemptVpcCniDeletion(ctx context.Context, clusterConfig *api.ClusterConfig logger.Debug("deleting kube-system/aws-node DaemonSet") err := clientSet.AppsV1().DaemonSets("kube-system").Delete(ctx, "aws-node", metav1.DeleteOptions{}) if err != nil { - logger.Debug("failed to delete kube-system/aws-node DaemonSet: %w", err) + logger.Debug("failed to delete kube-system/aws-node DaemonSet: %v", err) } } diff --git a/pkg/actions/cluster/delete_test.go b/pkg/actions/cluster/delete_test.go index 011c4dace5..84f79f5cbc 100644 --- a/pkg/actions/cluster/delete_test.go +++ b/pkg/actions/cluster/delete_test.go @@ -32,6 +32,7 @@ func (d *drainerMock) Drain(_ context.Context, input *nodegroup.DrainInput) erro var _ = Describe("DrainAllNodeGroups", func() { var ( clusterName string + ctx context.Context p *mockprovider.MockProvider cfg *api.ClusterConfig fakeStackManager *fakes.FakeStackManager @@ -41,6 +42,7 @@ var _ = Describe("DrainAllNodeGroups", func() { BeforeEach(func() { clusterName = "my-cluster" + ctx = context.Background() p = mockprovider.NewMockProvider() cfg = api.NewClusterConfig() cfg.Metadata.Name = clusterName @@ -52,7 +54,8 @@ var _ = Describe("DrainAllNodeGroups", func() { Context("draining node groups", func() { When("disable eviction flag is set to false", func() { It("drain the node groups", func() { - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) c.SetNewClientSet(func() (kubernetes.Interface, error) { return fakeClientSet, nil }) @@ -71,7 +74,7 @@ var _ = Describe("DrainAllNodeGroups", func() { vpcCniDeleterCalled++ } - err := cluster.DrainAllNodeGroups(context.Background(), cfg, ctl, fakeClientSet, nodeGroupStacks, false, 1, mockedDrainer, vpcCniDeleter, 0) + err = cluster.DrainAllNodeGroups(context.Background(), cfg, ctl, fakeClientSet, nodeGroupStacks, false, 1, mockedDrainer, vpcCniDeleter, 0) Expect(err).NotTo(HaveOccurred()) mockedDrainer.AssertNumberOfCalls(GinkgoT(), "Drain", 1) Expect(vpcCniDeleterCalled).To(Equal(1)) @@ -80,7 +83,8 @@ var _ = Describe("DrainAllNodeGroups", func() { When("disable eviction flag is set to true", func() { It("drain the node groups", func() { - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) c.SetNewClientSet(func() (kubernetes.Interface, error) { return fakeClientSet, nil }) @@ -100,7 +104,7 @@ var _ = Describe("DrainAllNodeGroups", func() { vpcCniDeleterCalled++ } - err := cluster.DrainAllNodeGroups(context.Background(), cfg, ctl, fakeClientSet, nodeGroupStacks, true, 1, mockedDrainer, vpcCniDeleter, 0) + err = cluster.DrainAllNodeGroups(context.Background(), cfg, ctl, fakeClientSet, nodeGroupStacks, true, 1, mockedDrainer, vpcCniDeleter, 0) Expect(err).NotTo(HaveOccurred()) mockedDrainer.AssertNumberOfCalls(GinkgoT(), "Drain", 1) Expect(vpcCniDeleterCalled).To(Equal(1)) @@ -109,7 +113,8 @@ var _ = Describe("DrainAllNodeGroups", func() { When("no node group stacks exist", func() { It("does no draining at all", func() { - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) c.SetNewClientSet(func() (kubernetes.Interface, error) { return fakeClientSet, nil }) @@ -128,7 +133,7 @@ var _ = Describe("DrainAllNodeGroups", func() { vpcCniDeleterCalled++ } - err := cluster.DrainAllNodeGroups(context.Background(), cfg, ctl, fakeClientSet, nodeGroupStacks, false, 1, mockedDrainer, vpcCniDeleter, 0) + err = cluster.DrainAllNodeGroups(context.Background(), cfg, ctl, fakeClientSet, nodeGroupStacks, false, 1, mockedDrainer, vpcCniDeleter, 0) Expect(err).NotTo(HaveOccurred()) mockedDrainer.AssertNotCalled(GinkgoT(), "Drain") Expect(vpcCniDeleterCalled).To(Equal(0)) diff --git a/pkg/actions/cluster/owned.go b/pkg/actions/cluster/owned.go index 36098e88d1..6e996c8640 100644 --- a/pkg/actions/cluster/owned.go +++ b/pkg/actions/cluster/owned.go @@ -9,6 +9,7 @@ import ( "github.com/kris-nova/logger" + "github.com/weaveworks/eksctl/pkg/actions/addon" "github.com/weaveworks/eksctl/pkg/actions/nodegroup" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/manager" @@ -28,7 +29,11 @@ type OwnedCluster struct { newNodeGroupManager func(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clientSet kubernetes.Interface) NodeGroupDrainer } -func NewOwnedCluster(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clusterStack *manager.Stack, stackManager manager.StackManager) *OwnedCluster { +func NewOwnedCluster(ctx context.Context, cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clusterStack *manager.Stack, stackManager manager.StackManager) (*OwnedCluster, error) { + instanceSelector, err := selector.New(context.Background(), ctl.AWSProvider.AWSConfig()) + if err != nil { + return nil, err + } return &OwnedCluster{ cfg: cfg, ctl: ctl, @@ -38,9 +43,9 @@ func NewOwnedCluster(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clusterSt return ctl.NewStdClientSet(cfg) }, newNodeGroupManager: func(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clientSet kubernetes.Interface) NodeGroupDrainer { - return nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())) + return nodegroup.New(cfg, ctl, clientSet, instanceSelector) }, - } + }, nil } func (c *OwnedCluster) Upgrade(ctx context.Context, dryRun bool) error { @@ -115,7 +120,8 @@ func (c *OwnedCluster) Delete(ctx context.Context, _, podEvictionWaitPeriod time newOIDCManager := func() (*iamoidc.OpenIDConnectManager, error) { return c.ctl.NewOpenIDConnectManager(ctx, c.cfg) } - tasks, err := c.stackManager.NewTasksToDeleteClusterWithNodeGroups(ctx, c.clusterStack, allStacks, clusterOperable, newOIDCManager, c.ctl.Status.ClusterInfo.Cluster, kubernetes.NewCachedClientSet(clientSet), wait, force, func(errs chan error, _ string) error { + newTasksToDeleteAddonIAM := addon.NewRemover(c.stackManager).DeleteAddonIAMTasks + tasks, err := c.stackManager.NewTasksToDeleteClusterWithNodeGroups(ctx, c.clusterStack, allStacks, clusterOperable, newOIDCManager, newTasksToDeleteAddonIAM, c.ctl.Status.ClusterInfo.Cluster, kubernetes.NewCachedClientSet(clientSet), wait, force, func(errs chan error, _ string) error { logger.Info("trying to cleanup dangling network interfaces") stack, err := c.stackManager.DescribeClusterStack(ctx) if err != nil { diff --git a/pkg/actions/cluster/owned_test.go b/pkg/actions/cluster/owned_test.go index 92f626f1ad..bca3f91050 100644 --- a/pkg/actions/cluster/owned_test.go +++ b/pkg/actions/cluster/owned_test.go @@ -41,6 +41,7 @@ func (d *drainerMockOwned) Drain(ctx context.Context, input *nodegroup.DrainInpu var _ = Describe("Delete", func() { var ( clusterName string + ctx context.Context p *mockprovider.MockProvider cfg *api.ClusterConfig fakeStackManager *fakes.FakeStackManager @@ -52,6 +53,7 @@ var _ = Describe("Delete", func() { BeforeEach(func() { clusterName = "my-cluster" + ctx = context.Background() p = mockprovider.NewMockProvider() cfg = api.NewClusterConfig() cfg.Metadata.Name = clusterName @@ -112,7 +114,8 @@ var _ = Describe("Delete", func() { fakeStackManager.GetKarpenterStackReturns(karpenterStack, nil) - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) fakeClientSet = fake.NewSimpleClientset() c.SetNewClientSet(func() (kubernetes.Interface, error) { @@ -124,7 +127,7 @@ var _ = Describe("Delete", func() { return mockedDrainer }) - err := c.Delete(context.Background(), time.Microsecond, 0, false, false, false, 1) + err = c.Delete(context.Background(), time.Microsecond, 0, false, false, false, 1) Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.DeleteTasksForDeprecatedStacksCallCount()).To(Equal(1)) Expect(ranDeleteDeprecatedTasks).To(BeTrue()) @@ -141,7 +144,7 @@ var _ = Describe("Delete", func() { ClusterInfo: &eks.ClusterInfo{ Cluster: &ekstypes.Cluster{ Status: ekstypes.ClusterStatusActive, - Version: aws.String("1.22"), + Version: aws.String("1.23"), }, }, } @@ -180,7 +183,8 @@ var _ = Describe("Delete", func() { Tasks: []tasks.Task{}, }, nil) - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) fakeClientSet = fake.NewSimpleClientset() c.SetNewClientSet(func() (kubernetes.Interface, error) { @@ -199,7 +203,7 @@ var _ = Describe("Delete", func() { return mockedDrainer }) - err := c.Delete(context.Background(), time.Microsecond, 0, false, true, false, 1) + err = c.Delete(context.Background(), time.Microsecond, 0, false, true, false, 1) Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.DeleteTasksForDeprecatedStacksCallCount()).To(Equal(1)) Expect(ranDeleteDeprecatedTasks).To(BeFalse()) @@ -245,7 +249,8 @@ var _ = Describe("Delete", func() { Tasks: []tasks.Task{}, }, nil) - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) fakeClientSet = fake.NewSimpleClientset() c.SetNewClientSet(func() (kubernetes.Interface, error) { @@ -261,7 +266,7 @@ var _ = Describe("Delete", func() { ClusterInfo: &eks.ClusterInfo{ Cluster: &ekstypes.Cluster{ Status: ekstypes.ClusterStatusActive, - Version: aws.String("1.22"), + Version: aws.String("1.23"), }, }, } @@ -272,7 +277,7 @@ var _ = Describe("Delete", func() { return mockedDrainer }) - err := c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) + err = c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) Expect(err).To(MatchError(errorMessage)) Expect(fakeStackManager.DeleteTasksForDeprecatedStacksCallCount()).To(Equal(0)) Expect(ranDeleteDeprecatedTasks).To(BeFalse()) @@ -315,7 +320,8 @@ var _ = Describe("Delete", func() { }}}, }, nil) - c := cluster.NewOwnedCluster(cfg, ctl, nil, fakeStackManager) + c, err := cluster.NewOwnedCluster(ctx, cfg, ctl, nil, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) c.SetNewNodeGroupManager(func(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clientSet kubernetes.Interface) cluster.NodeGroupDrainer { mockedDrainer := &drainerMockOwned{} mockedDrainer.On("Drain", mock.Anything).Return(nil) @@ -325,7 +331,7 @@ var _ = Describe("Delete", func() { return fake.NewSimpleClientset(), nil }) - err := c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) + err = c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.DeleteTasksForDeprecatedStacksCallCount()).To(Equal(1)) Expect(ranDeleteDeprecatedTasks).To(BeTrue()) diff --git a/pkg/actions/cluster/unowned.go b/pkg/actions/cluster/unowned.go index 934033b958..a998c4a92e 100644 --- a/pkg/actions/cluster/unowned.go +++ b/pkg/actions/cluster/unowned.go @@ -11,6 +11,7 @@ import ( "github.com/kris-nova/logger" "github.com/pkg/errors" + "github.com/weaveworks/eksctl/pkg/actions/addon" "github.com/weaveworks/eksctl/pkg/actions/nodegroup" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/manager" @@ -29,7 +30,11 @@ type UnownedCluster struct { newNodeGroupManager func(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clientSet kubernetes.Interface) NodeGroupDrainer } -func NewUnownedCluster(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, stackManager manager.StackManager) *UnownedCluster { +func NewUnownedCluster(ctx context.Context, cfg *api.ClusterConfig, ctl *eks.ClusterProvider, stackManager manager.StackManager) (*UnownedCluster, error) { + instanceSelector, err := selector.New(context.Background(), ctl.AWSProvider.AWSConfig()) + if err != nil { + return nil, err + } return &UnownedCluster{ cfg: cfg, ctl: ctl, @@ -38,9 +43,9 @@ func NewUnownedCluster(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, stackMa return ctl.NewStdClientSet(cfg) }, newNodeGroupManager: func(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, clientSet kubernetes.Interface) NodeGroupDrainer { - return nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())) + return nodegroup.New(cfg, ctl, clientSet, instanceSelector) }, - } + }, nil } func (c *UnownedCluster) Upgrade(ctx context.Context, dryRun bool) error { @@ -180,7 +185,7 @@ func (c *UnownedCluster) deleteIAMAndOIDC(ctx context.Context, wait bool, cluste } } - deleteAddonIAMTasks, err := c.stackManager.NewTaskToDeleteAddonIAM(ctx, wait) + deleteAddonIAMTasks, err := addon.NewRemover(c.stackManager).DeleteAddonIAMTasks(ctx, wait) if err != nil { return err } diff --git a/pkg/actions/cluster/unowned_test.go b/pkg/actions/cluster/unowned_test.go index b40d110d5f..2c027eaa72 100644 --- a/pkg/actions/cluster/unowned_test.go +++ b/pkg/actions/cluster/unowned_test.go @@ -43,6 +43,7 @@ func (d *drainerMockUnowned) Drain(ctx context.Context, input *nodegroup.DrainIn var _ = Describe("Delete", func() { var ( clusterName string + ctx context.Context p *mockprovider.MockProvider cfg *api.ClusterConfig fakeStackManager *fakes.FakeStackManager @@ -52,6 +53,7 @@ var _ = Describe("Delete", func() { BeforeEach(func() { clusterName = "my-cluster" + ctx = context.Background() p = mockprovider.NewMockProvider() cfg = api.NewClusterConfig() cfg.Metadata.Name = clusterName @@ -147,14 +149,15 @@ var _ = Describe("Delete", func() { p.MockEKS().On("DeleteNodegroup", mock.Anything, &awseks.DeleteNodegroupInput{ClusterName: &clusterName, NodegroupName: aws.String("ng-2")}).Return(&awseks.DeleteNodegroupOutput{}, nil) p.MockEKS().On("DeleteCluster", mock.Anything, mock.Anything).Return(&awseks.DeleteClusterOutput{}, nil) - c := cluster.NewUnownedCluster(cfg, ctl, fakeStackManager) + c, err := cluster.NewUnownedCluster(ctx, cfg, ctl, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) fakeClientSet := fake.NewSimpleClientset() c.SetNewClientSet(func() (kubernetes.Interface, error) { return fakeClientSet, nil }) - err := c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) + err = c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) Expect(err).NotTo(HaveOccurred()) Expect(deleteCallCount).To(Equal(1)) Expect(unownedDeleteCallCount).To(Equal(1)) @@ -238,7 +241,8 @@ var _ = Describe("Delete", func() { }, }, } - c := cluster.NewUnownedCluster(cfg, ctl, fakeStackManager) + c, err := cluster.NewUnownedCluster(ctx, cfg, ctl, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) fakeClientSet := fake.NewSimpleClientset() c.SetNewClientSet(func() (kubernetes.Interface, error) { @@ -257,7 +261,7 @@ var _ = Describe("Delete", func() { return mockedDrainer }) - err := c.Delete(context.Background(), time.Microsecond, time.Second*0, false, true, false, 1) + err = c.Delete(context.Background(), time.Microsecond, time.Second*0, false, true, false, 1) Expect(err).NotTo(HaveOccurred()) Expect(deleteCallCount).To(Equal(0)) Expect(unownedDeleteCallCount).To(Equal(0)) @@ -333,7 +337,8 @@ var _ = Describe("Delete", func() { p.MockEKS().On("DeleteNodegroup", mock.Anything, nil).Return(&awseks.DeleteNodegroupOutput{}, nil) p.MockEKS().On("DeleteCluster", mock.Anything, mock.Anything).Return(&awseks.DeleteClusterOutput{}, nil) - c := cluster.NewUnownedCluster(cfg, ctl, fakeStackManager) + c, err := cluster.NewUnownedCluster(ctx, cfg, ctl, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) fakeClientSet := fake.NewSimpleClientset() c.SetNewClientSet(func() (kubernetes.Interface, error) { @@ -360,7 +365,7 @@ var _ = Describe("Delete", func() { return mockedDrainer }) - err := c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) + err = c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) Expect(err).To(MatchError(errorMessage)) Expect(deleteCallCount).To(Equal(0)) Expect(unownedDeleteCallCount).To(Equal(0)) @@ -423,8 +428,9 @@ var _ = Describe("Delete", func() { p.MockEKS().On("DeleteCluster", mock.Anything, mock.Anything).Return(&awseks.DeleteClusterOutput{}, nil) - c := cluster.NewUnownedCluster(cfg, ctl, fakeStackManager) - err := c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) + c, err := cluster.NewUnownedCluster(ctx, cfg, ctl, fakeStackManager) + Expect(err).NotTo(HaveOccurred()) + err = c.Delete(context.Background(), time.Microsecond, time.Second*0, false, false, false, 1) Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.DeleteTasksForDeprecatedStacksCallCount()).To(Equal(1)) Expect(deleteCallCount).To(Equal(1)) diff --git a/pkg/actions/cluster/upgrade.go b/pkg/actions/cluster/upgrade.go index 5d9784dc1e..4dbc825147 100644 --- a/pkg/actions/cluster/upgrade.go +++ b/pkg/actions/cluster/upgrade.go @@ -126,6 +126,8 @@ func getNextVersion(currentVersion string) (string, error) { return api.Version1_27, nil case api.Version1_27: return api.Version1_28, nil + case api.Version1_28: + return api.Version1_29, nil default: // version of control plane is not known to us, maybe we are just too old... return "", fmt.Errorf("control plane version %q is not known to this version of eksctl, try to upgrade eksctl first", currentVersion) diff --git a/pkg/actions/cluster/upgrade_test.go b/pkg/actions/cluster/upgrade_test.go index a87471b3e4..c3691ad965 100644 --- a/pkg/actions/cluster/upgrade_test.go +++ b/pkg/actions/cluster/upgrade_test.go @@ -35,15 +35,15 @@ var _ = Describe("upgrade cluster", func() { Entry("upgrades by default when the version is not specified", upgradeCase{ givenVersion: "", - eksVersion: "1.22", - expectedUpgradeVersion: "1.23", + eksVersion: "1.23", + expectedUpgradeVersion: "1.24", expectedUpgrade: true, }), Entry("upgrades by default when the version is auto", upgradeCase{ givenVersion: "auto", - eksVersion: "1.22", - expectedUpgradeVersion: "1.23", + eksVersion: "1.23", + expectedUpgradeVersion: "1.24", expectedUpgrade: true, }), @@ -55,9 +55,9 @@ var _ = Describe("upgrade cluster", func() { }), Entry("upgrades to the next version when specified", upgradeCase{ - givenVersion: "1.22", - eksVersion: "1.21", - expectedUpgradeVersion: "1.22", + givenVersion: "1.23", + eksVersion: "1.22", + expectedUpgradeVersion: "1.23", expectedUpgrade: true, }), @@ -87,9 +87,9 @@ var _ = Describe("upgrade cluster", func() { }), Entry("fails when the version is still not supported", upgradeCase{ - givenVersion: "1.28", + givenVersion: "1.29", eksVersion: api.LatestVersion, - expectedErrorText: "control plane version \"1.28\" is not known to this version of eksctl", + expectedErrorText: "control plane version \"1.29\" is not known to this version of eksctl", }), ) }) diff --git a/pkg/actions/fargate/create_test.go b/pkg/actions/fargate/create_test.go index b8fbfd7482..4b64ac52b1 100644 --- a/pkg/actions/fargate/create_test.go +++ b/pkg/actions/fargate/create_test.go @@ -64,7 +64,7 @@ var _ = Describe("Fargate", func() { ClusterInfo: &eks.ClusterInfo{ Cluster: &ekstypes.Cluster{ Status: ekstypes.ClusterStatusActive, - Version: aws.String("1.22"), + Version: aws.String("1.23"), }, }, }} diff --git a/pkg/actions/iamidentitymapping/create.go b/pkg/actions/iamidentitymapping/create.go index 74610a9038..221afc86d0 100644 --- a/pkg/actions/iamidentitymapping/create.go +++ b/pkg/actions/iamidentitymapping/create.go @@ -26,7 +26,7 @@ func (m *Manager) Create(ctx context.Context, mapping *api.IAMIdentityMapping) e return errors.Wrap(err, "error parsing cluster ARN") } sa := authconfigmap.NewServiceAccess(m.rawClient, acm, parsedARN.AccountID) - return sa.Grant(mapping.ServiceName, mapping.Namespace, api.Partition(m.region)) + return sa.Grant(mapping.ServiceName, mapping.Namespace, api.Partitions.ForRegion(m.region)) } if mapping.Account == "" { diff --git a/pkg/actions/nodegroup/create.go b/pkg/actions/nodegroup/create.go index 4b6974a2aa..6366dbcd2d 100644 --- a/pkg/actions/nodegroup/create.go +++ b/pkg/actions/nodegroup/create.go @@ -4,12 +4,19 @@ import ( "context" "fmt" "io" + "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ec2" + ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/kris-nova/logger" "github.com/pkg/errors" defaultaddons "github.com/weaveworks/eksctl/pkg/addons/default" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + "github.com/weaveworks/eksctl/pkg/awsapi" + "github.com/weaveworks/eksctl/pkg/cfn/builder" "github.com/weaveworks/eksctl/pkg/cfn/manager" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils/filter" @@ -52,7 +59,11 @@ func (m *Manager) Create(ctx context.Context, options CreateOpts, nodegroupFilte return errors.New(msg) } - isOwnedCluster := true + var ( + isOwnedCluster = true + skipEgressRules = false + ) + clusterStack, err := m.stackManager.DescribeClusterStack(ctx) if err != nil { switch err.(type) { @@ -65,6 +76,10 @@ func (m *Manager) Create(ctx context.Context, options CreateOpts, nodegroupFilte return errors.Wrapf(err, "loading VPC spec for cluster %q", meta.Name) } isOwnedCluster = false + skipEgressRules, err = validateSecurityGroup(ctx, ctl.AWSProvider.EC2(), cfg.VPC.SecurityGroup) + if err != nil { + return err + } default: return fmt.Errorf("getting existing configuration for cluster %q: %w", meta.Name, err) @@ -89,7 +104,7 @@ func (m *Manager) Create(ctx context.Context, options CreateOpts, nodegroupFilte return err } - if err := m.checkARMSupport(ctx, ctl, rawClient, cfg, options.SkipOutdatedAddonsCheck); err != nil { + if err := m.checkARMSupport(ctx, rawClient, cfg, options.SkipOutdatedAddonsCheck); err != nil { return err } @@ -149,7 +164,7 @@ func (m *Manager) Create(ctx context.Context, options CreateOpts, nodegroupFilte return cmdutils.PrintNodeGroupDryRunConfig(clusterConfigCopy, options.DryRunSettings.OutStream) } - if err := m.nodeCreationTasks(ctx, isOwnedCluster); err != nil { + if err := m.nodeCreationTasks(ctx, isOwnedCluster, skipEgressRules); err != nil { return err } @@ -181,7 +196,7 @@ func makeOutpostsService(clusterConfig *api.ClusterConfig, provider api.ClusterP } } -func (m *Manager) nodeCreationTasks(ctx context.Context, isOwnedCluster bool) error { +func (m *Manager) nodeCreationTasks(ctx context.Context, isOwnedCluster, skipEgressRules bool) error { cfg := m.cfg meta := cfg.Metadata @@ -235,7 +250,7 @@ func (m *Manager) nodeCreationTasks(ctx context.Context, isOwnedCluster bool) er allNodeGroupTasks := &tasks.TaskTree{ Parallel: true, } - nodeGroupTasks := m.stackManager.NewUnmanagedNodeGroupTask(ctx, cfg.NodeGroups, !awsNodeUsesIRSA, vpcImporter) + nodeGroupTasks := m.stackManager.NewUnmanagedNodeGroupTask(ctx, cfg.NodeGroups, !awsNodeUsesIRSA, skipEgressRules, vpcImporter) if nodeGroupTasks.Len() > 0 { allNodeGroupTasks.Append(nodeGroupTasks) } @@ -287,14 +302,9 @@ func (m *Manager) postNodeCreationTasks(ctx context.Context, clientSet kubernete return nil } -func (m *Manager) checkARMSupport(ctx context.Context, ctl *eks.ClusterProvider, rawClient *kubernetes.RawClient, cfg *api.ClusterConfig, skipOutdatedAddonsCheck bool) error { - kubeProvider := m.ctl - kubernetesVersion, err := kubeProvider.ServerVersion(rawClient) - if err != nil { - return err - } +func (m *Manager) checkARMSupport(ctx context.Context, rawClient *kubernetes.RawClient, cfg *api.ClusterConfig, skipOutdatedAddonsCheck bool) error { if api.ClusterHasInstanceType(cfg, instanceutils.IsARMInstanceType) { - upToDate, err := defaultaddons.DoAddonsSupportMultiArch(ctx, ctl.AWSProvider.EKS(), rawClient, kubernetesVersion, ctl.AWSProvider.Region()) + upToDate, err := defaultaddons.DoAddonsSupportMultiArch(ctx, rawClient.ClientSet()) if err != nil { return err } @@ -316,11 +326,63 @@ func loadVPCFromConfig(ctx context.Context, provider api.ClusterProvider, cfg *a if err := vpc.ImportSubnetsFromSpec(ctx, provider, cfg); err != nil { return err } - if err := cfg.HasSufficientSubnets(); err != nil { logger.Critical("unable to use given %s", cfg.SubnetInfo()) return err } - return cfg.CanUseForPrivateNodeGroups() } + +func validateSecurityGroup(ctx context.Context, ec2API awsapi.EC2, securityGroupID string) (hasDefaultEgressRule bool, err error) { + paginator := ec2.NewDescribeSecurityGroupRulesPaginator(ec2API, &ec2.DescribeSecurityGroupRulesInput{ + Filters: []ec2types.Filter{ + { + Name: aws.String("group-id"), + Values: []string{securityGroupID}, + }, + }, + }) + var sgRules []ec2types.SecurityGroupRule + for paginator.HasMorePages() { + output, err := paginator.NextPage(ctx) + if err != nil { + return false, err + } + sgRules = append(sgRules, output.SecurityGroupRules...) + } + + makeError := func(sgRuleID string) error { + return fmt.Errorf("vpc.securityGroup (%s) has egress rules that were not attached by eksctl; "+ + "vpc.securityGroup should not contain any non-default external egress rules on a cluster not created by eksctl (rule ID: %s)", securityGroupID, sgRuleID) + } + + isDefaultEgressRule := func(sgRule ec2types.SecurityGroupRule) bool { + return aws.ToString(sgRule.IpProtocol) == "-1" && aws.ToInt32(sgRule.FromPort) == -1 && aws.ToInt32(sgRule.ToPort) == -1 && aws.ToString(sgRule.CidrIpv4) == "0.0.0.0/0" + } + + for _, sgRule := range sgRules { + if !aws.ToBool(sgRule.IsEgress) { + continue + } + if !hasDefaultEgressRule && isDefaultEgressRule(sgRule) { + hasDefaultEgressRule = true + continue + } + if !strings.HasPrefix(aws.ToString(sgRule.Description), builder.ControlPlaneEgressRuleDescriptionPrefix) { + return false, makeError(aws.ToString(sgRule.SecurityGroupRuleId)) + } + matched := false + for _, egressRule := range builder.ControlPlaneNodeGroupEgressRules { + if aws.ToString(sgRule.IpProtocol) == egressRule.IPProtocol && + aws.ToInt32(sgRule.FromPort) == int32(egressRule.FromPort) && + aws.ToInt32(sgRule.ToPort) == int32(egressRule.ToPort) { + matched = true + break + } + } + if !matched { + return false, makeError(aws.ToString(sgRule.SecurityGroupRuleId)) + } + } + return hasDefaultEgressRule, nil +} diff --git a/pkg/actions/nodegroup/create_test.go b/pkg/actions/nodegroup/create_test.go index 2c70107bc9..f205a6490a 100644 --- a/pkg/actions/nodegroup/create_test.go +++ b/pkg/actions/nodegroup/create_test.go @@ -49,7 +49,7 @@ type stackManagerDelegate struct { manager.StackManager } -func (s *stackManagerDelegate) NewUnmanagedNodeGroupTask(context.Context, []*api.NodeGroup, bool, vpc.Importer) *tasks.TaskTree { +func (s *stackManagerDelegate) NewUnmanagedNodeGroupTask(context.Context, []*api.NodeGroup, bool, bool, vpc.Importer) *tasks.TaskTree { return &tasks.TaskTree{ Tasks: []tasks.Task{noopTask}, } @@ -144,6 +144,52 @@ var _ = DescribeTable("Create", func(t ngEntry) { expectedErr: errors.Wrapf(errors.New("VPC configuration required for creating nodegroups on clusters not owned by eksctl: vpc.subnets, vpc.id, vpc.securityGroup"), "loading VPC spec for cluster %q", "my-cluster"), }), + Entry("when cluster is unowned and vpc.securityGroup contains external egress rules, it fails validation", ngEntry{ + updateClusterConfig: makeUnownedClusterConfig, + mockCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter, p *mockprovider.MockProvider, _ *fake.Clientset) { + mockProviderForUnownedCluster(p, k, ec2types.SecurityGroupRule{ + Description: aws.String("Allow control plane to communicate with a custom nodegroup on a custom port"), + FromPort: aws.Int32(8443), + ToPort: aws.Int32(8443), + GroupId: aws.String("sg-custom"), + IpProtocol: aws.String("https"), + IsEgress: aws.Bool(true), + SecurityGroupRuleId: aws.String("sgr-5"), + }) + + }, + expectedErr: errors.New("vpc.securityGroup (sg-custom) has egress rules that were not attached by eksctl; vpc.securityGroup should not contain any non-default external egress rules on a cluster not created by eksctl (rule ID: sgr-5)"), + }), + + Entry("when cluster is unowned and vpc.securityGroup contains a default egress rule, it passes validation but fails if DescribeImages fails", ngEntry{ + updateClusterConfig: makeUnownedClusterConfig, + mockCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter, p *mockprovider.MockProvider, _ *fake.Clientset) { + mockProviderForUnownedCluster(p, k, ec2types.SecurityGroupRule{ + Description: aws.String(""), + CidrIpv4: aws.String("0.0.0.0/0"), + FromPort: aws.Int32(-1), + ToPort: aws.Int32(-1), + GroupId: aws.String("sg-custom"), + IpProtocol: aws.String("-1"), + IsEgress: aws.Bool(true), + SecurityGroupRuleId: aws.String("sgr-5"), + }) + p.MockEC2().On("DescribeImages", mock.Anything, mock.Anything).Return(nil, errors.New("DescribeImages error")) + + }, + expectedErr: errors.New("DescribeImages error"), + }), + + Entry("when cluster is unowned and vpc.securityGroup contains no external egress rules, it passes validation but fails if DescribeImages fails", ngEntry{ + updateClusterConfig: makeUnownedClusterConfig, + mockCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter, p *mockprovider.MockProvider, _ *fake.Clientset) { + mockProviderForUnownedCluster(p, k) + p.MockEC2().On("DescribeImages", mock.Anything, mock.Anything).Return(nil, errors.New("DescribeImages error")) + + }, + expectedErr: errors.New("DescribeImages error"), + }), + Entry("fails when cluster is not compatible with ng config", ngEntry{ mockCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter, p *mockprovider.MockProvider, _ *fake.Clientset) { // no shared security group will trigger a compatibility check failure later in the call chain. @@ -165,7 +211,6 @@ var _ = DescribeTable("Create", func(t ngEntry) { }, expectedCalls: func(k *fakes.FakeKubeProvider, _ *utilFakes.FakeNodegroupFilter) { Expect(k.NewRawClientCallCount()).To(Equal(1)) - Expect(k.ServerVersionCallCount()).To(Equal(1)) }, expectedErr: errors.Wrap(errors.New("shared node security group missing, to fix this run 'eksctl update cluster --name=my-cluster --region='"), "cluster compatibility check failed")}), @@ -176,7 +221,6 @@ var _ = DescribeTable("Create", func(t ngEntry) { }, expectedCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter) { Expect(k.NewRawClientCallCount()).To(Equal(1)) - Expect(k.ServerVersionCallCount()).To(Equal(1)) Expect(f.SetOnlyLocalCallCount()).To(Equal(1)) }, expectedErr: errors.New("err"), @@ -191,7 +235,6 @@ var _ = DescribeTable("Create", func(t ngEntry) { }, expectedCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter) { Expect(k.NewRawClientCallCount()).To(Equal(1)) - Expect(k.ServerVersionCallCount()).To(Equal(1)) Expect(f.SetOnlyLocalCallCount()).To(Equal(1)) }, expectedErr: errors.New("failed to determine if aws-node uses IRSA"), @@ -408,7 +451,6 @@ var _ = DescribeTable("Create", func(t ngEntry) { }, expectedCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter) { Expect(k.NewRawClientCallCount()).To(Equal(1)) - Expect(k.ServerVersionCallCount()).To(Equal(1)) Expect(f.SetOnlyLocalCallCount()).To(Equal(1)) }, }), @@ -419,7 +461,6 @@ var _ = DescribeTable("Create", func(t ngEntry) { }, expectedCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter) { Expect(k.NewRawClientCallCount()).To(Equal(1)) - Expect(k.ServerVersionCallCount()).To(Equal(1)) Expect(f.SetOnlyLocalCallCount()).To(Equal(1)) }, }), @@ -441,7 +482,6 @@ var _ = DescribeTable("Create", func(t ngEntry) { }, expectedCalls: func(k *fakes.FakeKubeProvider, f *utilFakes.FakeNodegroupFilter) { Expect(k.NewRawClientCallCount()).To(Equal(1)) - Expect(k.ServerVersionCallCount()).To(Equal(1)) Expect(f.SetOnlyLocalCallCount()).To(Equal(1)) }, }), @@ -593,3 +633,122 @@ func mockProviderWithConfig(p *mockprovider.MockProvider, describeStacksOutput [ }, }, nil) } + +func mockProviderForUnownedCluster(p *mockprovider.MockProvider, k *fakes.FakeKubeProvider, extraSGRules ...ec2types.SecurityGroupRule) { + k.NewRawClientReturns(&kubernetes.RawClient{}, nil) + k.ServerVersionReturns("1.27", nil) + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + StackSummaries: []cftypes.StackSummary{ + { + StackName: aws.String("eksctl-my-cluster-cluster"), + StackStatus: "CREATE_COMPLETE", + }, + }, + }, nil) + p.MockCloudFormation().On("DescribeStacks", mock.Anything, mock.Anything).Return(&cloudformation.DescribeStacksOutput{ + Stacks: []cftypes.Stack{ + { + StackName: aws.String("eksctl-my-cluster-cluster"), + StackStatus: "CREATE_COMPLETE", + }, + }, + }, nil) + + vpcID := aws.String("vpc-custom") + p.MockEC2().On("DescribeVpcs", mock.Anything, mock.Anything).Return(&ec2.DescribeVpcsOutput{ + Vpcs: []ec2types.Vpc{ + { + CidrBlock: aws.String("192.168.0.0/19"), + VpcId: vpcID, + CidrBlockAssociationSet: []ec2types.VpcCidrBlockAssociation{ + { + CidrBlock: aws.String("192.168.0.0/19"), + }, + }, + }, + }, + }, nil) + p.MockEC2().On("DescribeSubnets", mock.Anything, mock.Anything).Return(&ec2.DescribeSubnetsOutput{ + Subnets: []ec2types.Subnet{ + { + SubnetId: aws.String("subnet-custom1"), + CidrBlock: aws.String("192.168.160.0/19"), + AvailabilityZone: aws.String("us-west-2a"), + VpcId: vpcID, + }, + { + SubnetId: aws.String("subnet-custom2"), + CidrBlock: aws.String("192.168.96.0/19"), + AvailabilityZone: aws.String("us-west-2b"), + VpcId: vpcID, + }, + }, + }, nil) + + sgID := aws.String("sg-custom") + p.MockEC2().On("DescribeSecurityGroupRules", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeSecurityGroupRulesInput) bool { + if len(input.Filters) != 1 { + return false + } + filter := input.Filters[0] + return *filter.Name == "group-id" && len(filter.Values) == 1 && filter.Values[0] == *sgID + })).Return(&ec2.DescribeSecurityGroupRulesOutput{ + SecurityGroupRules: append([]ec2types.SecurityGroupRule{ + { + Description: aws.String("Allow control plane to communicate with worker nodes in group ng-1 (kubelet and workload TCP ports"), + FromPort: aws.Int32(1025), + ToPort: aws.Int32(65535), + GroupId: sgID, + IpProtocol: aws.String("tcp"), + IsEgress: aws.Bool(true), + SecurityGroupRuleId: aws.String("sgr-1"), + }, + { + Description: aws.String("Allow control plane to communicate with worker nodes in group ng-1 (workload using HTTPS port, commonly used with extension API servers"), + FromPort: aws.Int32(443), + ToPort: aws.Int32(443), + GroupId: sgID, + IpProtocol: aws.String("tcp"), + IsEgress: aws.Bool(true), + SecurityGroupRuleId: aws.String("sgr-2"), + }, + { + Description: aws.String("Allow control plane to receive API requests from worker nodes in group ng-1"), + FromPort: aws.Int32(443), + ToPort: aws.Int32(443), + GroupId: sgID, + IpProtocol: aws.String("tcp"), + IsEgress: aws.Bool(false), + SecurityGroupRuleId: aws.String("sgr-3"), + }, + { + Description: aws.String("Allow control plane to communicate with worker nodes in group ng-2 (workload using HTTPS port, commonly used with extension API servers"), + FromPort: aws.Int32(443), + ToPort: aws.Int32(443), + GroupId: sgID, + IpProtocol: aws.String("tcp"), + IsEgress: aws.Bool(true), + SecurityGroupRuleId: aws.String("sgr-4"), + }, + }, extraSGRules...), + }, nil) +} + +func makeUnownedClusterConfig(clusterConfig *api.ClusterConfig) { + clusterConfig.VPC = &api.ClusterVPC{ + SecurityGroup: "sg-custom", + Network: api.Network{ + ID: "vpc-custom", + }, + Subnets: &api.ClusterSubnets{ + Private: api.AZSubnetMapping{ + "us-west-2a": api.AZSubnetSpec{ + ID: "subnet-custom1", + }, + "us-west-2b": api.AZSubnetSpec{ + ID: "subnet-custom2", + }, + }, + }, + } +} diff --git a/pkg/actions/nodegroup/drain.go b/pkg/actions/nodegroup/drain.go index 57e45a8926..0896309ce2 100644 --- a/pkg/actions/nodegroup/drain.go +++ b/pkg/actions/nodegroup/drain.go @@ -42,7 +42,7 @@ func (m *Manager) Drain(ctx context.Context, input *DrainInput) error { } err := g.Wait() if err != nil { - logger.Critical("Node group drain failed: %w", err) + logger.Critical("Node group drain failed: %v", err) } waitForAllRoutinesToFinish(ctx, sem, parallelLimit) return err diff --git a/pkg/actions/nodegroup/get.go b/pkg/actions/nodegroup/get.go index 3e661aa646..30a2e08e18 100644 --- a/pkg/actions/nodegroup/get.go +++ b/pkg/actions/nodegroup/get.go @@ -250,7 +250,7 @@ func (m *Manager) mapStackToNodeGroupSummary(ctx context.Context, stack *manager } collectorSet := outputs.NewCollectorSet(collectors) if err := collectorSet.MustCollect(*stack); err != nil { - logger.Warning(fmt.Errorf("error collecting Cloudformation outputs for stack %s: %w", *stack.StackName, err).Error()) + logger.Warning("error collecting Cloudformation outputs for stack %s: %v", *stack.StackName, err) } } diff --git a/pkg/actions/nodegroup/get_test.go b/pkg/actions/nodegroup/get_test.go index b1dbb6d1ab..655baae3da 100644 --- a/pkg/actions/nodegroup/get_test.go +++ b/pkg/actions/nodegroup/get_test.go @@ -407,7 +407,7 @@ var _ = Describe("Get", func() { }, Status: corev1.NodeStatus{ NodeInfo: corev1.NodeSystemInfo{ - KubeletVersion: "1.22.1", + KubeletVersion: "1.23.1", }, }, }, metav1.CreateOptions{}) @@ -468,7 +468,7 @@ var _ = Describe("Get", func() { MaxSize: 100, DesiredCapacity: 50, MinSize: 1, - Version: "1.22.1", + Version: "1.23.1", CreationTime: creationTime, NodeGroupType: api.NodeGroupTypeUnmanaged, })) diff --git a/pkg/actions/nodegroup/nodegroup_suite_test.go b/pkg/actions/nodegroup/nodegroup_suite_test.go index ecabf775e2..8161d1d0d8 100644 --- a/pkg/actions/nodegroup/nodegroup_suite_test.go +++ b/pkg/actions/nodegroup/nodegroup_suite_test.go @@ -1,7 +1,7 @@ package nodegroup_test import ( - "io/ioutil" + "os" "strings" "testing" @@ -35,7 +35,7 @@ var _ = BeforeSuite(func() { }) func mustReadFile(path string) string { - bytes, err := ioutil.ReadFile(path) + bytes, err := os.ReadFile(path) Expect(err).NotTo(HaveOccurred()) return strings.Trim(string(bytes), "\n") } diff --git a/pkg/actions/nodegroup/testdata/al2-force-false-template.json b/pkg/actions/nodegroup/testdata/al2-force-false-template.json index f0d32145d4..fba5f9fe55 100644 --- a/pkg/actions/nodegroup/testdata/al2-force-false-template.json +++ b/pkg/actions/nodegroup/testdata/al2-force-false-template.json @@ -13,6 +13,16 @@ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", diff --git a/pkg/actions/nodegroup/testdata/al2-no-force-template.json b/pkg/actions/nodegroup/testdata/al2-no-force-template.json index f0389bfd79..2cd2b5c8e5 100644 --- a/pkg/actions/nodegroup/testdata/al2-no-force-template.json +++ b/pkg/actions/nodegroup/testdata/al2-no-force-template.json @@ -13,6 +13,16 @@ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", diff --git a/pkg/actions/nodegroup/testdata/al2-updated-template.json b/pkg/actions/nodegroup/testdata/al2-updated-template.json index 95d05f1d5f..b076f09e8f 100644 --- a/pkg/actions/nodegroup/testdata/al2-updated-template.json +++ b/pkg/actions/nodegroup/testdata/al2-updated-template.json @@ -13,6 +13,16 @@ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", @@ -130,7 +140,7 @@ ] }, "NodegroupName": "amazonlinux2", - "ReleaseVersion": "1.27-20201212", + "ReleaseVersion": "1.28-20201212", "ScalingConfig": { "DesiredSize": 4, "MaxSize": 4, @@ -203,4 +213,4 @@ } } } -} +} \ No newline at end of file diff --git a/pkg/actions/nodegroup/testdata/br-force-false-template.json b/pkg/actions/nodegroup/testdata/br-force-false-template.json index 89079105c9..7b51077eff 100644 --- a/pkg/actions/nodegroup/testdata/br-force-false-template.json +++ b/pkg/actions/nodegroup/testdata/br-force-false-template.json @@ -14,6 +14,16 @@ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", diff --git a/pkg/actions/nodegroup/testdata/br-force-true-template.json b/pkg/actions/nodegroup/testdata/br-force-true-template.json index ba43850044..f95ec3a952 100644 --- a/pkg/actions/nodegroup/testdata/br-force-true-template.json +++ b/pkg/actions/nodegroup/testdata/br-force-true-template.json @@ -14,6 +14,16 @@ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", diff --git a/pkg/actions/nodegroup/testdata/br-updated-template.json b/pkg/actions/nodegroup/testdata/br-updated-template.json index 8d83845c4a..72d87782fa 100644 --- a/pkg/actions/nodegroup/testdata/br-updated-template.json +++ b/pkg/actions/nodegroup/testdata/br-updated-template.json @@ -13,6 +13,16 @@ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", @@ -131,6 +141,7 @@ ] }, "NodegroupName": "br", + "ReleaseVersion": "1.14.2-1602f3a8", "ScalingConfig": { "DesiredSize": 4, "MaxSize": 4, @@ -147,8 +158,7 @@ "Tags": { "alpha.eksctl.io/nodegroup-name": "br", "alpha.eksctl.io/nodegroup-type": "managed" - }, - "Version": "1.27" + } } }, "NodeInstanceRole": { diff --git a/pkg/actions/nodegroup/upgrade_test.go b/pkg/actions/nodegroup/upgrade_test.go index 84c3cb7c97..bc258a7ba1 100644 --- a/pkg/actions/nodegroup/upgrade_test.go +++ b/pkg/actions/nodegroup/upgrade_test.go @@ -336,7 +336,7 @@ var _ = Describe("Upgrade", func() { Status: ekstypes.NodegroupStatusActive, AmiType: ekstypes.AMITypesBottlerocketX8664, Version: eksVersion, - ReleaseVersion: eksReleaseVersion, + ReleaseVersion: aws.String("1.13.1-2913d3b6"), }, }, nil) @@ -344,7 +344,7 @@ var _ = Describe("Upgrade", func() { Name: aws.String(fmt.Sprintf("/aws/service/bottlerocket/aws-k8s-%s/x86_64/latest/image_version", latestEKSVersion)), }).Return(&ssm.GetParameterOutput{ Parameter: &ssmtypes.Parameter{ - Value: aws.String("1.5.2-1602f3a8"), + Value: aws.String("1.14.2-1602f3a8"), }, }, nil) }) diff --git a/pkg/addons/default/addons.go b/pkg/addons/default/addons.go index 3baaab8e7b..76036996f3 100644 --- a/pkg/addons/default/addons.go +++ b/pkg/addons/default/addons.go @@ -2,10 +2,15 @@ package defaultaddons import ( "context" + "fmt" - "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/kris-nova/logger" + "github.com/pkg/errors" + "github.com/weaveworks/eksctl/pkg/awsapi" "github.com/weaveworks/eksctl/pkg/kubernetes" ) @@ -18,37 +23,63 @@ type AddonInput struct { } // DoAddonsSupportMultiArch checks if the coredns/kubeproxy/awsnode support multi arch nodegroups -// We know that AWS node requires 1.6.3+ to work, so we check for that -// Kubeproxy/coredns we don't know what version adds support, so we just ensure its up-to-date before proceeding. -// TODO: we should know what versions of kubeproxy/coredns added support, rather than always erroring if they are out of date -func DoAddonsSupportMultiArch(ctx context.Context, eksAPI awsapi.EKS, rawClient kubernetes.RawClientInterface, controlPlaneVersion string, region string) (bool, error) { - input := AddonInput{ - RawClient: rawClient, - ControlPlaneVersion: controlPlaneVersion, - Region: region, - EKSAPI: eksAPI, - } - kubeProxyUpToDate, err := IsKubeProxyUpToDate(ctx, input) +// We know that AWS node requires 1.6.3+ to work, so we check for that. +// For kube-proxy and CoreDNS, we do not know what version adds support, so we just ensure they contain a node affinity +// that allows them to be scheduled on ARM64 nodes. +func DoAddonsSupportMultiArch(ctx context.Context, clientSet kubernetes.Interface) (bool, error) { + kubeProxy, err := getKubeProxy(ctx, clientSet) if err != nil { - return true, err + return false, err } - if !kubeProxyUpToDate { + + if kubeProxy != nil && !supportsMultiArch(kubeProxy.Spec.Template.Spec) { return false, nil } - awsNodeUpToDate, err := DoesAWSNodeSupportMultiArch(ctx, input) + awsNodeSupportsMultiArch, err := DoesAWSNodeSupportMultiArch(ctx, clientSet) if err != nil { - return true, err + return false, err } - if !awsNodeUpToDate { + if !awsNodeSupportsMultiArch { return false, nil } - coreDNSUpToDate, err := IsCoreDNSUpToDate(ctx, input) + coreDNS, err := getCoreDNS(ctx, clientSet) + if err != nil { + return false, err + } + return coreDNS == nil || supportsMultiArch(coreDNS.Spec.Template.Spec), nil +} + +// supportsMultiArch returns true if the PodSpec contains a node affinity that allows the pod to be scheduled on +// multiple architectures. +func supportsMultiArch(podSec corev1.PodSpec) bool { + if podSec.Affinity == nil || podSec.Affinity.NodeAffinity == nil || podSec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil { + return false + } + for _, nodeSelectorTerm := range podSec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms { + for _, me := range nodeSelectorTerm.MatchExpressions { + if me.Key == corev1.LabelArchStable && me.Operator == corev1.NodeSelectorOpIn { + for _, val := range me.Values { + if val == "arm64" { + return true + } + } + } + } + } + return false +} + +func makeGetError[T any](resource *T, err error, resourceName string) (*T, error) { if err != nil { - return true, err + if apierrors.IsNotFound(err) { + logger.Warning("%q was not found", resourceName) + return nil, nil + } + return nil, fmt.Errorf("getting %q: %w", resourceName, err) } - return coreDNSUpToDate, nil + return resource, nil } // LoadAsset return embedded manifest as a runtime.Object diff --git a/pkg/addons/default/assets/aws-node.yaml b/pkg/addons/default/assets/aws-node.yaml index b4cfef2c78..8dba481b47 100644 --- a/pkg/addons/default/assets/aws-node.yaml +++ b/pkg/addons/default/assets/aws-node.yaml @@ -1,26 +1,9 @@ --- -# Source: aws-vpc-cni/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: aws-node - namespace: kube-system - labels: - app.kubernetes.io/name: aws-node - app.kubernetes.io/instance: aws-vpc-cni - k8s-app: aws-node - app.kubernetes.io/version: "v1.11.3" ---- -# Source: aws-vpc-cni/templates/customresourcedefinition.yaml +# Source: crds/customresourcedefinition.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: eniconfigs.crd.k8s.amazonaws.com - labels: - app.kubernetes.io/name: aws-node - app.kubernetes.io/instance: aws-vpc-cni - k8s-app: aws-node - app.kubernetes.io/version: "v1.11.3" spec: scope: Cluster group: crd.k8s.amazonaws.com @@ -37,6 +20,19 @@ spec: plural: eniconfigs singular: eniconfig kind: ENIConfig + +--- +# Source: aws-vpc-cni/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: aws-node + namespace: kube-system + labels: + app.kubernetes.io/name: aws-node + app.kubernetes.io/instance: aws-vpc-cni + k8s-app: aws-node + app.kubernetes.io/version: "v1.12.6" --- # Source: aws-vpc-cni/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -47,7 +43,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.3" + app.kubernetes.io/version: "v1.12.6" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -73,7 +69,7 @@ rules: - apiGroups: ["", "events.k8s.io"] resources: - events - verbs: ["create", "patch", "list", "get"] + verbs: ["create", "patch", "list"] --- # Source: aws-vpc-cni/templates/clusterrolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -84,7 +80,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.3" + app.kubernetes.io/version: "v1.12.6" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -104,7 +100,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.3" + app.kubernetes.io/version: "v1.12.6" spec: updateStrategy: rollingUpdate: @@ -125,7 +121,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.6" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -143,7 +139,7 @@ spec: {} containers: - name: aws-node - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.3" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.6" ports: - containerPort: 61678 name: metrics @@ -172,8 +168,6 @@ spec: value: "true" - name: AWS_VPC_ENI_MTU value: "9001" - - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER - value: "false" - name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG value: "false" - name: AWS_VPC_K8S_CNI_EXTERNALSNAT @@ -212,6 +206,10 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: MY_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name resources: requests: cpu: 25m @@ -219,7 +217,7 @@ spec: capabilities: add: - NET_ADMIN - allowPrivilegeEscalation: false + - NET_RAW volumeMounts: - mountPath: /host/opt/cni/bin name: cni-bin-dir @@ -227,8 +225,6 @@ spec: name: cni-net-dir - mountPath: /host/var/log/aws-routed-eni name: log-dir - - mountPath: /var/run/dockershim.sock - name: dockershim - mountPath: /var/run/aws-node name: run-dir - mountPath: /run/xtables.lock @@ -240,9 +236,6 @@ spec: - name: cni-net-dir hostPath: path: /etc/cni/net.d - - name: dockershim - hostPath: - path: /var/run/dockershim.sock - name: log-dir hostPath: path: /var/log/aws-routed-eni diff --git a/pkg/addons/default/assets/coredns-1.23.json b/pkg/addons/default/assets/coredns-1.23.json index 8f75415009..3dd45f4b4c 100644 --- a/pkg/addons/default/assets/coredns-1.23.json +++ b/pkg/addons/default/assets/coredns-1.23.json @@ -169,7 +169,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.2", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.24.json b/pkg/addons/default/assets/coredns-1.24.json index 6c57a00b65..59c4ee0623 100644 --- a/pkg/addons/default/assets/coredns-1.24.json +++ b/pkg/addons/default/assets/coredns-1.24.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.3", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.25.json b/pkg/addons/default/assets/coredns-1.25.json index 275418780b..243f65b3f4 100644 --- a/pkg/addons/default/assets/coredns-1.25.json +++ b/pkg/addons/default/assets/coredns-1.25.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.2", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.26.json b/pkg/addons/default/assets/coredns-1.26.json index b6b7be6c35..1eb6e77d40 100644 --- a/pkg/addons/default/assets/coredns-1.26.json +++ b/pkg/addons/default/assets/coredns-1.26.json @@ -170,13 +170,13 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.2", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.9.3-eksbuild.7", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, "httpGet": { - "path": "/ready", - "port": 8181, + "path": "/health", + "port": 8080, "scheme": "HTTP" }, "initialDelaySeconds": 60, @@ -205,8 +205,8 @@ "readinessProbe": { "failureThreshold": 3, "httpGet": { - "path": "/health", - "port": 8080, + "path": "/ready", + "port": 8181, "scheme": "HTTP" }, "periodSeconds": 10, @@ -372,4 +372,4 @@ } ], "kind": "List" -} +} \ No newline at end of file diff --git a/pkg/addons/default/assets/coredns-1.27.json b/pkg/addons/default/assets/coredns-1.27.json index 3ad8d820d7..4cf4a2b158 100644 --- a/pkg/addons/default/assets/coredns-1.27.json +++ b/pkg/addons/default/assets/coredns-1.27.json @@ -170,7 +170,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.1", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.4", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, diff --git a/pkg/addons/default/assets/coredns-1.22.json b/pkg/addons/default/assets/coredns-1.28.json similarity index 93% rename from pkg/addons/default/assets/coredns-1.22.json rename to pkg/addons/default/assets/coredns-1.28.json index 79c2cfef95..95ceca2326 100644 --- a/pkg/addons/default/assets/coredns-1.22.json +++ b/pkg/addons/default/assets/coredns-1.28.json @@ -19,6 +19,7 @@ "namespace": "kube-system" }, "spec": { + "internalTrafficPolicy": "Cluster", "ipFamilies": [ "IPv4" ], @@ -60,7 +61,7 @@ { "apiVersion": "v1", "data": { - "Corefile": ".:53 {\n errors\n health {\n lameduck 5s\n }\n ready\n kubernetes cluster.local in-addr.arpa ip6.arpa {\n pods insecure\n fallthrough in-addr.arpa ip6.arpa\n }\n prometheus :9153\n forward . /etc/resolv.conf\n cache 30\n loop\n reload\n loadbalance\n}\n" + "Corefile": ".:53 {\n errors\n health {\n lameduck 5s\n }\n ready\n kubernetes cluster.local in-addr.arpa ip6.arpa {\n pods insecure\n fallthrough in-addr.arpa ip6.arpa\n }\n prometheus :9153\n forward . /etc/resolv.conf\n cache 30\n loop\n reload\n loadbalance\n}\n" }, "kind": "ConfigMap", "metadata": { @@ -106,8 +107,11 @@ "template": { "metadata": { "annotations": { - "eks.amazonaws.com/compute-type": "ec2" + "cluster-autoscaler.kubernetes.io/safe-to-evict": "false", + "eks.amazonaws.com/compute-type": "ec2", + "karpenter.sh/do-not-evict": "true" }, + "creationTimestamp": null, "labels": { "eks.amazonaws.com/component": "coredns", "k8s-app": "kube-dns" @@ -168,7 +172,7 @@ "-conf", "/etc/coredns/Corefile" ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.8.7-eksbuild.1", + "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.10.1-eksbuild.4", "imagePullPolicy": "IfNotPresent", "livenessProbe": { "failureThreshold": 5, @@ -207,7 +211,6 @@ "port": 8181, "scheme": "HTTP" }, - "initialDelaySeconds": 30, "periodSeconds": 10, "successThreshold": 1, "timeoutSeconds": 1 @@ -371,4 +374,4 @@ } ], "kind": "List" -} +} \ No newline at end of file diff --git a/pkg/addons/default/aws_node.go b/pkg/addons/default/aws_node.go index c446cfe362..62cee2e9eb 100644 --- a/pkg/addons/default/aws_node.go +++ b/pkg/addons/default/aws_node.go @@ -7,12 +7,12 @@ import ( "github.com/blang/semver" "github.com/kris-nova/logger" - "github.com/pkg/errors" + appsv1 "k8s.io/api/apps/v1" - apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/weaveworks/eksctl/pkg/addons" + "github.com/weaveworks/eksctl/pkg/kubernetes" // For go:embed _ "embed" @@ -30,14 +30,13 @@ const ( var latestAWSNodeYaml []byte // DoesAWSNodeSupportMultiArch makes sure awsnode supports ARM nodes -func DoesAWSNodeSupportMultiArch(ctx context.Context, input AddonInput) (bool, error) { - clusterDaemonSet, err := input.RawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(ctx, AWSNode, metav1.GetOptions{}) +func DoesAWSNodeSupportMultiArch(ctx context.Context, clientSet kubernetes.Interface) (bool, error) { + clusterDaemonSet, err := getAWSNode(ctx, clientSet) if err != nil { - if apierrs.IsNotFound(err) { - logger.Warning("%q was not found", AWSNode) - return true, nil - } - return false, errors.Wrapf(err, "getting %q", AWSNode) + return false, err + } + if clusterDaemonSet == nil { + return true, nil } minVersion := semver.Version{ @@ -71,13 +70,12 @@ func DoesAWSNodeSupportMultiArch(ctx context.Context, input AddonInput) (bool, e // UpdateAWSNode will update the `aws-node` add-on and returns true // if an update is available. func UpdateAWSNode(ctx context.Context, input AddonInput, plan bool) (bool, error) { - clusterDaemonSet, err := input.RawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(ctx, AWSNode, metav1.GetOptions{}) + clusterDaemonSet, err := getAWSNode(ctx, input.RawClient.ClientSet()) if err != nil { - if apierrs.IsNotFound(err) { - logger.Warning("%q was not found", AWSNode) - return false, nil - } - return false, errors.Wrapf(err, "getting %q", AWSNode) + return false, err + } + if clusterDaemonSet == nil { + return false, nil } resourceList, err := newList(latestAWSNodeYaml) @@ -171,3 +169,8 @@ func UpdateAWSNode(ctx context.Context, input AddonInput, plan bool) (bool, erro logger.Info("%q is now up-to-date", AWSNode) return false, nil } + +func getAWSNode(ctx context.Context, clientSet kubernetes.Interface) (*appsv1.DaemonSet, error) { + d, err := clientSet.AppsV1().DaemonSets(metav1.NamespaceSystem).Get(ctx, AWSNode, metav1.GetOptions{}) + return makeGetError(d, err, AWSNode) +} diff --git a/pkg/addons/default/aws_node_generate.go b/pkg/addons/default/aws_node_generate.go index 471bcf2c99..f229625c1a 100644 --- a/pkg/addons/default/aws_node_generate.go +++ b/pkg/addons/default/aws_node_generate.go @@ -1,4 +1,4 @@ package defaultaddons // Please refer to https://docs.aws.amazon.com/eks/latest/userguide/cni-upgrades.html -//go:generate curl --silent --location https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.11.3/config/master/aws-k8s-cni.yaml?raw=1 --output assets/aws-node.yaml +//go:generate curl --silent --location https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.12.6/config/master/aws-k8s-cni.yaml?raw=1 --output assets/aws-node.yaml diff --git a/pkg/addons/default/aws_node_test.go b/pkg/addons/default/aws_node_test.go index 40d5dd0d0f..272a47f080 100644 --- a/pkg/addons/default/aws_node_test.go +++ b/pkg/addons/default/aws_node_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + v1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,7 +34,7 @@ var _ = Describe("AWS Node", func() { input.ControlPlaneVersion = "1.15.0" rawClient.AssumeObjectsMissing = false - needsUpdate, err := da.DoesAWSNodeSupportMultiArch(context.Background(), input) + needsUpdate, err := da.DoesAWSNodeSupportMultiArch(context.Background(), rawClient.ClientSet()) Expect(err).NotTo(HaveOccurred()) Expect(needsUpdate).To(BeFalse()) }) @@ -42,7 +43,7 @@ var _ = Describe("AWS Node", func() { loadSamples(rawClient, "testdata/sample-1.16-eksbuild.1.json") rawClient.AssumeObjectsMissing = false - needsUpdate, err := da.DoesAWSNodeSupportMultiArch(context.Background(), input) + needsUpdate, err := da.DoesAWSNodeSupportMultiArch(context.Background(), rawClient.ClientSet()) Expect(err).NotTo(HaveOccurred()) Expect(needsUpdate).To(BeTrue()) }) @@ -51,7 +52,7 @@ var _ = Describe("AWS Node", func() { loadSamples(rawClient, "testdata/sample-1.16-v1.7.json") rawClient.AssumeObjectsMissing = false - needsUpdate, err := da.DoesAWSNodeSupportMultiArch(context.Background(), input) + needsUpdate, err := da.DoesAWSNodeSupportMultiArch(context.Background(), rawClient.ClientSet()) Expect(err).NotTo(HaveOccurred()) Expect(needsUpdate).To(BeTrue()) }) @@ -78,11 +79,11 @@ var _ = Describe("AWS Node", func() { Expect(err).NotTo(HaveOccurred()) Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To( - Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.11.3"), + Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.12.6"), ) Expect(awsNode.Spec.Template.Spec.InitContainers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.InitContainers[0].Image).To( - Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.3"), + Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.12.6"), ) }) }) @@ -98,11 +99,11 @@ var _ = Describe("AWS Node", func() { Expect(err).NotTo(HaveOccurred()) Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To( - Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.3"), + Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.12.6"), ) Expect(awsNode.Spec.Template.Spec.InitContainers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.InitContainers[0].Image).To( - Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.11.3"), + Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.12.6"), ) }) }) diff --git a/pkg/addons/default/coredns.go b/pkg/addons/default/coredns.go index aa97b9d5fe..cc90cf2ba5 100644 --- a/pkg/addons/default/coredns.go +++ b/pkg/addons/default/coredns.go @@ -8,15 +8,16 @@ import ( "github.com/kris-nova/logger" "github.com/pkg/errors" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/weaveworks/eksctl/pkg/addons" - api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/fargate/coredns" + "github.com/weaveworks/eksctl/pkg/kubernetes" // For go:embed _ "embed" @@ -32,55 +33,6 @@ const ( //go:embed assets/coredns*.json var coreDNSDir embed.FS -func IsCoreDNSUpToDate(ctx context.Context, input AddonInput) (bool, error) { - kubeDNSDeployment, err := input.RawClient.ClientSet().AppsV1().Deployments(metav1.NamespaceSystem).Get(ctx, CoreDNS, metav1.GetOptions{}) - if err != nil { - if apierrs.IsNotFound(err) { - logger.Warning("%q was not found", CoreDNS) - return true, nil - } - return false, errors.Wrapf(err, "getting %q", CoreDNS) - } - - // if Deployment is present, go through our list of assets - list, err := loadAssetCoreDNS(input.ControlPlaneVersion) - if err != nil { - return false, err - } - - for _, rawObj := range list.Items { - resource, err := input.RawClient.NewRawResource(rawObj.Object) - if err != nil { - return false, err - } - if resource.GVK.Kind != "Deployment" { - continue - } - if resource.Info.Name != "coredns" { - continue - } - deployment, ok := resource.Info.Object.(*appsv1.Deployment) - if !ok { - return false, fmt.Errorf("expected type %T; got %T", &appsv1.Deployment{}, resource.Info.Object) - } - if err := addons.UseRegionalImage(&deployment.Spec.Template, input.Region); err != nil { - return false, err - } - if computeType, ok := kubeDNSDeployment.Spec.Template.Annotations[coredns.ComputeTypeAnnotationKey]; ok { - deployment.Spec.Template.Annotations[coredns.ComputeTypeAnnotationKey] = computeType - } - tagMismatch, err := addons.ImageTagsDiffer( - deployment.Spec.Template.Spec.Containers[0].Image, - kubeDNSDeployment.Spec.Template.Spec.Containers[0].Image, - ) - if err != nil { - return false, err - } - return !tagMismatch, err - } - return true, nil -} - // UpdateCoreDNS will update the `coredns` add-on and returns true // if an update is available func UpdateCoreDNS(ctx context.Context, input AddonInput, plan bool) (bool, error) { @@ -165,6 +117,11 @@ func UpdateCoreDNS(ctx context.Context, input AddonInput, plan bool) (bool, erro return false, nil } +func getCoreDNS(ctx context.Context, clientSet kubernetes.Interface) (*appsv1.Deployment, error) { + d, err := clientSet.AppsV1().Deployments(metav1.NamespaceSystem).Get(ctx, CoreDNS, metav1.GetOptions{}) + return makeGetError(d, err, CoreDNS) +} + func loadAssetCoreDNS(controlPlaneVersion string) (*metav1.List, error) { if strings.HasPrefix(controlPlaneVersion, "1.10.") { return nil, errors.New("CoreDNS is not supported on Kubernetes 1.10") diff --git a/pkg/addons/default/coredns_test.go b/pkg/addons/default/coredns_test.go index efa2e5e5d2..419ced39b1 100644 --- a/pkg/addons/default/coredns_test.go +++ b/pkg/addons/default/coredns_test.go @@ -2,13 +2,16 @@ package defaultaddons_test import ( "context" + "fmt" + "os" + "path/filepath" + "regexp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" da "github.com/weaveworks/eksctl/pkg/addons/default" - "github.com/weaveworks/eksctl/pkg/testutils" ) @@ -25,12 +28,12 @@ var _ = Describe("default addons - coredns", func() { rawClient = testutils.NewFakeRawClient() rawClient.UseUnionTracker = true region = "eu-west-2" - controlPlaneVersion = "1.23.x" - kubernetesVersion = "1.22" + kubernetesVersion = "1.25" + controlPlaneVersion = "1.26" input = da.AddonInput{ RawClient: rawClient, - ControlPlaneVersion: controlPlaneVersion, + ControlPlaneVersion: controlPlaneVersion + ".x", Region: region, } }) @@ -42,7 +45,12 @@ var _ = Describe("default addons - coredns", func() { BeforeEach(func() { createCoreDNSFromTestSample(rawClient, kubernetesVersion) - expectedImageTag = "v1.8.7-eksbuild.2" + + coreFile, err := os.ReadFile(filepath.Join("assets", fmt.Sprintf("coredns-%s.json", controlPlaneVersion))) + Expect(err).NotTo(HaveOccurred()) + + expectedImageTag = regexp.MustCompile(`v\d+\.\d+\.\d+-eksbuild\.\d+`).FindString(string(coreFile)) + Expect(expectedImageTag).NotTo(BeEmpty()) }) It("updates coredns to the correct version", func() { @@ -68,34 +76,6 @@ var _ = Describe("default addons - coredns", func() { ) }) }) - - Context("IsCoreDNSUpToDate", func() { - BeforeEach(func() { - createCoreDNSFromTestSample(rawClient, kubernetesVersion) - _, err := da.UpdateCoreDNS(context.Background(), input, false) - Expect(err).NotTo(HaveOccurred()) - }) - - Context("when CoreDNS is NOT up to date", func() { - BeforeEach(func() { - input.ControlPlaneVersion = "1.22.x" - }) - - It("reports 'false'", func() { - isUpToDate, err := da.IsCoreDNSUpToDate(context.Background(), input) - Expect(err).NotTo(HaveOccurred()) - Expect(isUpToDate).To(Equal(false)) - }) - }) - - Context("when CoreDNS is up to date", func() { - It("reports 'true'", func() { - isUpToDate, err := da.IsCoreDNSUpToDate(context.Background(), input) - Expect(err).NotTo(HaveOccurred()) - Expect(isUpToDate).To(Equal(true)) - }) - }) - }) }) func createCoreDNSFromTestSample(rawClient *testutils.FakeRawClient, kubernetesVersion string) { diff --git a/pkg/addons/default/kube_proxy.go b/pkg/addons/default/kube_proxy.go index a315197317..8f992c4f31 100644 --- a/pkg/addons/default/kube_proxy.go +++ b/pkg/addons/default/kube_proxy.go @@ -11,61 +11,34 @@ import ( "github.com/hashicorp/go-version" "github.com/kris-nova/logger" - "github.com/pkg/errors" + v1 "k8s.io/api/apps/v1" - apierrs "k8s.io/apimachinery/pkg/api/errors" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/weaveworks/eksctl/pkg/addons" "github.com/weaveworks/eksctl/pkg/awsapi" + "github.com/weaveworks/eksctl/pkg/kubernetes" "github.com/weaveworks/eksctl/pkg/printers" ) const ( // KubeProxy is the name of the kube-proxy addon KubeProxy = "kube-proxy" - ArchLabel = "kubernetes.io/arch" ) -func IsKubeProxyUpToDate(ctx context.Context, input AddonInput) (bool, error) { - d, err := input.RawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(ctx, KubeProxy, metav1.GetOptions{}) - if err != nil { - if apierrs.IsNotFound(err) { - logger.Warning("%q was not found", KubeProxy) - return true, nil - } - return false, errors.Wrapf(err, "getting %q", KubeProxy) - } - if numContainers := len(d.Spec.Template.Spec.Containers); !(numContainers >= 1) { - return false, fmt.Errorf("%s has %d containers, expected at least 1", KubeProxy, numContainers) - } - - desiredTag, err := getLatestKubeProxyImage(ctx, input) - if err != nil { - return false, err - } - image := d.Spec.Template.Spec.Containers[0].Image - imageTag, err := addons.ImageTag(image) - if err != nil { - return false, err - } - return desiredTag == imageTag, nil -} - // UpdateKubeProxy updates image tag for kube-system:daemonset/kube-proxy based to match ControlPlaneVersion func UpdateKubeProxy(ctx context.Context, input AddonInput, plan bool) (bool, error) { printer := printers.NewJSONPrinter() - d, err := input.RawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(context.TODO(), KubeProxy, metav1.GetOptions{}) + d, err := getKubeProxy(ctx, input.RawClient.ClientSet()) if err != nil { - if apierrs.IsNotFound(err) { - logger.Warning("%q was not found", KubeProxy) - return false, nil - } - return false, errors.Wrapf(err, "getting %q", KubeProxy) + return false, err + } + if d == nil { + return false, nil } - hasArm64NodeSelector := daemeonSetHasArm64NodeSelector(d) + hasArm64NodeSelector := supportsMultiArch(d.Spec.Template.Spec) if !hasArm64NodeSelector { logger.Info("missing arm64 nodeSelector value") } @@ -121,23 +94,9 @@ func UpdateKubeProxy(ctx context.Context, input AddonInput, plan bool) (bool, er return false, nil } -func daemeonSetHasArm64NodeSelector(daemonSet *v1.DaemonSet) bool { - if daemonSet.Spec.Template.Spec.Affinity != nil && - daemonSet.Spec.Template.Spec.Affinity.NodeAffinity != nil && - daemonSet.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution != nil { - for _, nodeSelectorTerms := range daemonSet.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms { - for _, nodeSelector := range nodeSelectorTerms.MatchExpressions { - if nodeSelector.Key == ArchLabel { - for _, value := range nodeSelector.Values { - if value == "arm64" { - return true - } - } - } - } - } - } - return false +func getKubeProxy(ctx context.Context, clientSet kubernetes.Interface) (*v1.DaemonSet, error) { + d, err := clientSet.AppsV1().DaemonSets(metav1.NamespaceSystem).Get(ctx, KubeProxy, metav1.GetOptions{}) + return makeGetError(d, err, KubeProxy) } func addArm64NodeSelector(daemonSet *v1.DaemonSet) error { @@ -145,7 +104,7 @@ func addArm64NodeSelector(daemonSet *v1.DaemonSet) error { for nodeSelectorTermsIndex, nodeSelectorTerms := range daemonSet.Spec.Template.Spec.Affinity.NodeAffinity. RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms { for nodeSelectorIndex, nodeSelector := range nodeSelectorTerms.MatchExpressions { - if nodeSelector.Key == ArchLabel { + if nodeSelector.Key == corev1.LabelArchStable { daemonSet.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution. NodeSelectorTerms[nodeSelectorTermsIndex].MatchExpressions[nodeSelectorIndex].Values = append(nodeSelector.Values, "arm64") } diff --git a/pkg/addons/default/kube_proxy_test.go b/pkg/addons/default/kube_proxy_test.go index 845d6b18cb..f1e05b59ba 100644 --- a/pkg/addons/default/kube_proxy_test.go +++ b/pkg/addons/default/kube_proxy_test.go @@ -4,6 +4,9 @@ import ( "context" "fmt" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/aws/aws-sdk-go-v2/aws" awseks "github.com/aws/aws-sdk-go-v2/service/eks" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" @@ -11,7 +14,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/stretchr/testify/mock" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" da "github.com/weaveworks/eksctl/pkg/addons/default" "github.com/weaveworks/eksctl/pkg/kubernetes" @@ -24,102 +26,13 @@ var _ = Describe("KubeProxy", func() { clientSet kubernetes.Interface input da.AddonInput mockProvider *mockprovider.MockProvider - kubernetesVersion = aws.String("1.22") - controlPlaneVersion = "1.22.1" + kubernetesVersion = aws.String("1.23") + controlPlaneVersion = "1.23.1" ) - Context("IsKubeProxyUpToDate", func() { - BeforeEach(func() { - mockProvider = mockprovider.NewMockProvider() - input = da.AddonInput{ - Region: "eu-west-1", - EKSAPI: mockProvider.EKS(), - ControlPlaneVersion: controlPlaneVersion, - } - - mockProvider.MockEKS().On("DescribeAddonVersions", mock.Anything, &awseks.DescribeAddonVersionsInput{ - AddonName: aws.String("kube-proxy"), - KubernetesVersion: kubernetesVersion, - }).Return(&awseks.DescribeAddonVersionsOutput{ - Addons: []ekstypes.AddonInfo{ - { - AddonName: aws.String("kube-proxy"), - AddonVersions: []ekstypes.AddonVersionInfo{ - { - AddonVersion: aws.String("v1.17.0-eksbuild.1"), - }, - { - //latest, unordered list to ensure we sort correctly - AddonVersion: aws.String("v1.18.1-eksbuild.2"), - }, - { - AddonVersion: aws.String("v1.18.1-eksbuild.1"), - }, - }, - }, - }, - }, nil) - }) - - When("its not up-to-date", func() { - BeforeEach(func() { - rawClient := testutils.NewFakeRawClientWithSamples("testdata/sample-1.16-eksbuild.1.json") - input.RawClient = rawClient - clientSet = rawClient.ClientSet() - }) - - It("returns false", func() { - needsUpdating, err := da.IsKubeProxyUpToDate(context.Background(), input) - Expect(err).NotTo(HaveOccurred()) - Expect(needsUpdating).To(BeFalse()) - }) - }) - - When("when its up-to-date", func() { - BeforeEach(func() { - rawClient := testutils.NewFakeRawClientWithSamples("testdata/sample-1.22.json") - input.RawClient = rawClient - clientSet = rawClient.ClientSet() - }) - - It("returns true", func() { - needsUpdating, err := da.IsKubeProxyUpToDate(context.Background(), input) - Expect(err).NotTo(HaveOccurred()) - Expect(needsUpdating).To(BeTrue()) - }) - }) - - When("it doesn't exist", func() { - BeforeEach(func() { - rawClient := testutils.NewFakeRawClient() - input.RawClient = rawClient - clientSet = rawClient.ClientSet() - }) - - // if it doesn't exist it doesn't need updating, so its up to date ¯\_(ツ)_/¯ according to #2667 - It("returns true", func() { - needsUpdating, err := da.IsKubeProxyUpToDate(context.Background(), input) - Expect(err).NotTo(HaveOccurred()) - Expect(needsUpdating).To(BeTrue()) - }) - }) - - When("it has an existing invalid image tag", func() { - BeforeEach(func() { - rawClient := testutils.NewFakeRawClientWithSamples("testdata/sample-1.15-invalid-image.json") - input.RawClient = rawClient - clientSet = rawClient.ClientSet() - }) - It("errors", func() { - _, err := da.IsKubeProxyUpToDate(context.Background(), input) - Expect(err).To(HaveOccurred()) - }) - }) - }) - Context("UpdateKubeProxyImageTag", func() { BeforeEach(func() { - rawClient := testutils.NewFakeRawClientWithSamples("testdata/sample-1.22.json") + rawClient := testutils.NewFakeRawClientWithSamples("testdata/sample-1.23.json") clientSet = rawClient.ClientSet() mockProvider = mockprovider.NewMockProvider() input = da.AddonInput{ @@ -189,14 +102,14 @@ var _ = Describe("KubeProxy", func() { }, { // Latest, unordered list to ensure we sort correctly. - AddonVersion: aws.String("v1.22.1-eksbuild.2"), + AddonVersion: aws.String("v1.23.1-eksbuild.2"), }, { - AddonVersion: aws.String("v1.22.1-eksbuild.1"), + AddonVersion: aws.String("v1.23.1-eksbuild.1"), }, }, }, - expectedImageTag: "v1.22.1-minimal-eksbuild.2", + expectedImageTag: "v1.23.1-minimal-eksbuild.2", }), Entry("a more up-to-date version that lacks a pre-release version should be returned unchanged", versionUpdateEntry{ @@ -207,15 +120,15 @@ var _ = Describe("KubeProxy", func() { AddonVersion: aws.String("v1.17.0"), }, { - AddonVersion: aws.String("v1.22.2"), + AddonVersion: aws.String("v1.23.2"), }, { - AddonVersion: aws.String("v1.22.1"), + AddonVersion: aws.String("v1.23.1"), }, }, }, - expectedImageTag: "v1.22.2", + expectedImageTag: "v1.23.2", }), Entry("a more up-to-date version that lacks a `v` prefix should not have a `v` prefix", versionUpdateEntry{ @@ -227,15 +140,15 @@ var _ = Describe("KubeProxy", func() { }, { // Latest, unordered list to ensure we sort correctly. - AddonVersion: aws.String("1.22.1-eksbuild.2"), + AddonVersion: aws.String("1.23.1-eksbuild.2"), }, { - AddonVersion: aws.String("1.22.1-eksbuild.1"), + AddonVersion: aws.String("1.23.1-eksbuild.1"), }, }, }, - expectedImageTag: "1.22.1-minimal-eksbuild.2", + expectedImageTag: "1.23.1-minimal-eksbuild.2", }), Entry("version that is behind the default cluster version should not be used", versionUpdateEntry{ @@ -256,7 +169,7 @@ var _ = Describe("KubeProxy", func() { }, }, - expectedImageTag: "v1.22.1-eksbuild.1", + expectedImageTag: "v1.23.1-eksbuild.1", }), ) @@ -340,7 +253,7 @@ func kubeProxyNodeSelectorValues(clientSet kubernetes.Interface) []string { Expect(kubeProxy).NotTo(BeNil()) for _, nodeSelector := range kubeProxy.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions { - if nodeSelector.Key == "kubernetes.io/arch" { + if nodeSelector.Key == corev1.LabelArchStable { return nodeSelector.Values } } diff --git a/pkg/addons/default/scripts/update_coredns_assets.go b/pkg/addons/default/scripts/update_coredns_assets.go new file mode 100644 index 0000000000..3976c4d323 --- /dev/null +++ b/pkg/addons/default/scripts/update_coredns_assets.go @@ -0,0 +1,92 @@ +package main + +import ( + "context" + "fmt" + "log" + "os" + "path/filepath" + "regexp" + "sort" + "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + awseks "github.com/aws/aws-sdk-go-v2/service/eks" + "github.com/blang/semver" + + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + "github.com/weaveworks/eksctl/pkg/eks" +) + +func main() { + ctx := context.Background() + + clusterProvider, err := eks.New(ctx, &api.ProviderConfig{}, nil) + if err != nil { + log.Fatalf("failed to create the AWS provider: %v", err) + } + + for _, kubernetesVersion := range api.SupportedVersions() { + latestVersion := getLatestVersion(ctx, clusterProvider, kubernetesVersion) + if latestVersion == "" { + continue + } + replaceCurrentVersionIfOutdated(latestVersion, kubernetesVersion) + } + +} + +func getLatestVersion(ctx context.Context, clusterProvider *eks.ClusterProvider, kubernetesVersion string) string { + output, err := clusterProvider.AWSProvider.EKS().DescribeAddonVersions(ctx, &awseks.DescribeAddonVersionsInput{ + AddonName: aws.String("coredns"), + KubernetesVersion: &kubernetesVersion, + }) + if err != nil { + log.Fatalf("failed calling EKS::DescribeAddonVersions: %v", err) + } + + corednsVersions := output.Addons[0].AddonVersions + if len(corednsVersions) == 0 { + return "" + } + + sort.Slice(corednsVersions, func(i, j int) bool { + vi, err := semver.Parse(trim(*corednsVersions[i].AddonVersion)) + if err != nil { + log.Fatalf("failed to parse coredns version %s: %v", trim(*corednsVersions[i].AddonVersion), err) + } + vj, err := semver.Parse(trim(*corednsVersions[j].AddonVersion)) + if err != nil { + log.Fatalf("failed to parse coredns version %s: %v", trim(*corednsVersions[j].AddonVersion), err) + } + if vi.Compare(vj) >= 0 { + return true + } + return false + }) + + return *corednsVersions[0].AddonVersion +} + +func replaceCurrentVersionIfOutdated(latestVersion string, kubernetesVersion string) { + filePath := filepath.Join("pkg", "addons", "default", "assets", fmt.Sprintf("coredns-%s.json", kubernetesVersion)) + coreFile, err := os.ReadFile(filePath) + if err != nil { + log.Fatalf("failed to read coredns-%s.json: %v", kubernetesVersion, err) + } + + regexpVersion := regexp.MustCompile(`v\d+\.\d+\.\d+-eksbuild\.\d+`) + currentVersion := regexpVersion.FindString(string(coreFile)) + if currentVersion == "" { + log.Fatalf("couldn't find coredns version in coredns-%s.json", kubernetesVersion) + } + + updatedCoreFile := regexpVersion.ReplaceAllString(string(coreFile), latestVersion) + if err := os.WriteFile(filePath, []byte(updatedCoreFile), 0644); err != nil { + log.Fatalf("failed to write coredns-%s.json: %v", kubernetesVersion, err) + } +} + +func trim(version string) string { + return strings.TrimPrefix(version, "v") +} diff --git a/pkg/addons/default/testdata/sample-1.22.json b/pkg/addons/default/testdata/sample-1.23.json similarity index 99% rename from pkg/addons/default/testdata/sample-1.22.json rename to pkg/addons/default/testdata/sample-1.23.json index af3ef79b29..c8a80f4d44 100644 --- a/pkg/addons/default/testdata/sample-1.22.json +++ b/pkg/addons/default/testdata/sample-1.23.json @@ -70,7 +70,7 @@ "--v=2", "--config=/var/lib/kube-proxy-config/config" ], - "image": "602401143452.dkr.ecr.eu-west-1.amazonaws.com/eks/kube-proxy:v1.22.1-eksbuild.1", + "image": "602401143452.dkr.ecr.eu-west-1.amazonaws.com/eks/kube-proxy:v1.23.1-eksbuild.1", "imagePullPolicy": "IfNotPresent", "name": "kube-proxy", "resources": { @@ -338,7 +338,7 @@ "livenessProbe": { "failureThreshold": 5, "httpGet": { - "path": "/ready", + "path": "/health", "port": 8181, "scheme": "HTTP" }, @@ -368,7 +368,7 @@ "readinessProbe": { "failureThreshold": 3, "httpGet": { - "path": "/health", + "path": "/ready", "port": 8080, "scheme": "HTTP" }, diff --git a/pkg/addons/default/testdata/sample-1.25.json b/pkg/addons/default/testdata/sample-1.25.json index e26b21db7d..ff4ebdebe0 100644 --- a/pkg/addons/default/testdata/sample-1.25.json +++ b/pkg/addons/default/testdata/sample-1.25.json @@ -361,7 +361,7 @@ "livenessProbe": { "failureThreshold": 5, "httpGet": { - "path": "/ready", + "path": "/health", "port": 8181, "scheme": "HTTP" }, @@ -391,7 +391,7 @@ "readinessProbe": { "failureThreshold": 3, "httpGet": { - "path": "/health", + "path": "/ready", "port": 8080, "scheme": "HTTP" }, diff --git a/pkg/ami/ssm_resolver.go b/pkg/ami/ssm_resolver.go index e187914ce8..5ba6455f04 100644 --- a/pkg/ami/ssm_resolver.go +++ b/pkg/ami/ssm_resolver.go @@ -88,6 +88,10 @@ func MakeManagedSSMParameterName(version string, amiType ekstypes.AMITypes) (str case ekstypes.AMITypesAl2X8664Gpu: imageType := utils.ToKebabCase(api.NodeImageFamilyAmazonLinux2) + "-gpu" return fmt.Sprintf("/aws/service/eks/optimized-ami/%s/%s/recommended/release_version", version, imageType), nil + case ekstypes.AMITypesBottlerocketArm64, ekstypes.AMITypesBottlerocketArm64Nvidia: + return fmt.Sprintf("/aws/service/bottlerocket/aws-k8s-%s/arm64/latest/image_version", version), nil + case ekstypes.AMITypesBottlerocketX8664, ekstypes.AMITypesBottlerocketX8664Nvidia: + return fmt.Sprintf("/aws/service/bottlerocket/aws-k8s-%s/x86_64/latest/image_version", version), nil } return "", nil } diff --git a/pkg/ami/ssm_resolver_test.go b/pkg/ami/ssm_resolver_test.go index 076b9af878..fb2a97b61c 100644 --- a/pkg/ami/ssm_resolver_test.go +++ b/pkg/ami/ssm_resolver_test.go @@ -349,13 +349,13 @@ var _ = Describe("AMI Auto Resolution", func() { Context("and gpu instance", func() { BeforeEach(func() { instanceType = "p3.2xlarge" - version = "1.22" + version = "1.23" }) Context("and ami is available", func() { BeforeEach(func() { p = mockprovider.NewMockProvider() - addMockGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.22-nvidia/x86_64/latest/image_id", expectedAmi) + addMockGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.23-nvidia/x86_64/latest/image_id", expectedAmi) resolver := NewSSMResolver(p.MockSSM()) resolvedAmi, err = resolver.Resolve(context.Background(), region, version, instanceType, imageFamily) }) @@ -374,7 +374,7 @@ var _ = Describe("AMI Auto Resolution", func() { Context("and ami is NOT available", func() { BeforeEach(func() { p = mockprovider.NewMockProvider() - addMockFailedGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.22-nvidia/x86_64/latest/image_id") + addMockFailedGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.23-nvidia/x86_64/latest/image_id") resolver := NewSSMResolver(p.MockSSM()) resolvedAmi, err = resolver.Resolve(context.Background(), region, version, instanceType, imageFamily) diff --git a/pkg/apis/eksctl.io/v1alpha5/assets/schema.json b/pkg/apis/eksctl.io/v1alpha5/assets/schema.json index 2faf845df2..36f2e5017d 100755 --- a/pkg/apis/eksctl.io/v1alpha5/assets/schema.json +++ b/pkg/apis/eksctl.io/v1alpha5/assets/schema.json @@ -578,16 +578,16 @@ }, "version": { "type": "string", - "description": "Valid variants are: `\"1.22\"`, `\"1.23\"`, `\"1.24\"`, `\"1.25\"` (default), `\"1.26\"`, `\"1.27\"`.", - "x-intellij-html-description": "Valid variants are: "1.22", "1.23", "1.24", "1.25" (default), "1.26", "1.27".", - "default": "1.25", + "description": "Valid variants are: `\"1.23\"`, `\"1.24\"`, `\"1.25\"`, `\"1.26\"`, `\"1.27\"` (default), `\"1.28\"`.", + "x-intellij-html-description": "Valid variants are: "1.23", "1.24", "1.25", "1.26", "1.27" (default), "1.28".", + "default": "1.27", "enum": [ - "1.22", "1.23", "1.24", "1.25", "1.26", - "1.27" + "1.27", + "1.28" ] } }, @@ -933,8 +933,8 @@ "$ref": "#/definitions/OIDCIdentityProvider" } ], - "description": "holds an identity provider configuration. See [the example eksctl config](https://github.com/weaveworks/eksctl/blob/main/examples/27-oidc-provider.yaml).", - "x-intellij-html-description": "holds an identity provider configuration. See the example eksctl config." + "description": "holds an identity provider configuration. See [the example eksctl config](https://github.com/eksctl-io/eksctl/blob/main/examples/27-oidc-provider.yaml).", + "x-intellij-html-description": "holds an identity provider configuration. See the example eksctl config." }, "InlineDocument": { "additionalProperties": {}, diff --git a/pkg/apis/eksctl.io/v1alpha5/defaults.go b/pkg/apis/eksctl.io/v1alpha5/defaults.go index a04dc374fc..20e3323d5b 100644 --- a/pkg/apis/eksctl.io/v1alpha5/defaults.go +++ b/pkg/apis/eksctl.io/v1alpha5/defaults.go @@ -7,6 +7,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/weaveworks/eksctl/pkg/utils" ) @@ -78,7 +79,7 @@ func IAMServiceAccountsWithImplicitServiceAccounts(cfg *ClusterConfig) []*Cluste awsNode := ClusterIAMServiceAccount{ ClusterIAMMeta: AWSNodeMeta, AttachPolicyARNs: []string{ - fmt.Sprintf("arn:%s:iam::aws:policy/%s", Partition(cfg.Metadata.Region), IAMPolicyAmazonEKSCNIPolicy), + fmt.Sprintf("arn:%s:iam::aws:policy/%s", Partitions.ForRegion(cfg.Metadata.Region), IAMPolicyAmazonEKSCNIPolicy), }, } serviceAccounts = append(serviceAccounts, &awsNode) diff --git a/pkg/apis/eksctl.io/v1alpha5/endpoint_service.go b/pkg/apis/eksctl.io/v1alpha5/endpoint_service.go index b284bce838..3866c90d44 100644 --- a/pkg/apis/eksctl.io/v1alpha5/endpoint_service.go +++ b/pkg/apis/eksctl.io/v1alpha5/endpoint_service.go @@ -14,6 +14,8 @@ type EndpointService struct { OutpostsOnly bool // RequiresChinaPrefix is true if the endpoint service requires a prefix for China regions. RequiresChinaPrefix bool + // RequiresISOPrefix is true if the endpoint service requires a prefix for ISO regions. + RequiresISOPrefix bool } var ( @@ -33,14 +35,17 @@ var EndpointServices = []EndpointService{ { Name: "ec2", RequiresChinaPrefix: true, + RequiresISOPrefix: true, }, { Name: "ecr.api", RequiresChinaPrefix: true, + RequiresISOPrefix: true, }, { Name: "ecr.dkr", RequiresChinaPrefix: true, + RequiresISOPrefix: true, }, EndpointServiceS3, { @@ -69,8 +74,9 @@ var EndpointServices = []EndpointService{ RequiresChinaPrefix: true, }, { - Name: "autoscaling", - Optional: true, + Name: "autoscaling", + Optional: true, + RequiresISOPrefix: true, }, EndpointServiceCloudWatch, } diff --git a/pkg/apis/eksctl.io/v1alpha5/generate.go b/pkg/apis/eksctl.io/v1alpha5/generate.go index 2695d4193c..8fe4e1b0ca 100644 --- a/pkg/apis/eksctl.io/v1alpha5/generate.go +++ b/pkg/apis/eksctl.io/v1alpha5/generate.go @@ -7,6 +7,7 @@ import ( //go:generate go run ../../../../cmd/schema assets/schema.json -//SchemaJSON contains the schema +// SchemaJSON contains the schema +// //go:embed assets/schema.json var SchemaJSON string diff --git a/pkg/apis/eksctl.io/v1alpha5/identity_provider.go b/pkg/apis/eksctl.io/v1alpha5/identity_provider.go index 824315e5d5..33cbe946e0 100644 --- a/pkg/apis/eksctl.io/v1alpha5/identity_provider.go +++ b/pkg/apis/eksctl.io/v1alpha5/identity_provider.go @@ -33,7 +33,7 @@ type IdentityProviderInterface interface { // with `.(type)` to get access to the specific type // IdentityProvider holds an identity provider configuration. -// See [the example eksctl config](https://github.com/weaveworks/eksctl/blob/main/examples/27-oidc-provider.yaml). +// See [the example eksctl config](https://github.com/eksctl-io/eksctl/blob/main/examples/27-oidc-provider.yaml). // Schema type is one of `OIDCIdentityProvider` type IdentityProvider struct { // Valid variants are: diff --git a/pkg/apis/eksctl.io/v1alpha5/managed_nodegroup_test.go b/pkg/apis/eksctl.io/v1alpha5/managed_nodegroup_test.go index 7d50fb346b..31bb87a93b 100644 --- a/pkg/apis/eksctl.io/v1alpha5/managed_nodegroup_test.go +++ b/pkg/apis/eksctl.io/v1alpha5/managed_nodegroup_test.go @@ -1,6 +1,8 @@ package v1alpha5 import ( + "fmt" + "github.com/aws/aws-sdk-go-v2/aws" . "github.com/onsi/ginkgo/v2" @@ -63,7 +65,7 @@ var _ = Describe("Managed Nodegroup Validation", func() { AMIFamily: DefaultNodeImageFamily, }, }, - errMsg: "overrideBootstrapCommand is required when using a custom AMI", + errMsg: fmt.Sprintf("overrideBootstrapCommand is required when using a custom AMI based on %s", DefaultNodeImageFamily), }), Entry("Custom AMI with Windows AMI family without overrideBootstrapCommand", &nodeGroupCase{ ng: &ManagedNodeGroup{ diff --git a/pkg/apis/eksctl.io/v1alpha5/partitions.go b/pkg/apis/eksctl.io/v1alpha5/partitions.go new file mode 100644 index 0000000000..1bc9b82e46 --- /dev/null +++ b/pkg/apis/eksctl.io/v1alpha5/partitions.go @@ -0,0 +1,133 @@ +package v1alpha5 + +import "fmt" + +// Partitions. +const ( + PartitionAWS = "aws" + PartitionChina = "aws-cn" + PartitionUSGov = "aws-us-gov" + PartitionISO = "aws-iso" + PartitionISOB = "aws-iso-b" +) + +// partition is an AWS partition. +type partition struct { + name string + serviceMappings map[string]string + regions []string + endpointServiceDomainPrefix string +} + +type partitions []partition + +var standardServiceMappings = map[string]string{ + "EC2": "ec2.amazonaws.com", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com", +} + +const standardPartitionServiceDomainPrefix = "com.amazonaws" + +var awsPartition = partition{ + name: PartitionAWS, + serviceMappings: standardServiceMappings, + endpointServiceDomainPrefix: standardPartitionServiceDomainPrefix, +} + +// Partitions is a list of supported AWS partitions. +var Partitions = partitions{ + awsPartition, + { + name: PartitionUSGov, + serviceMappings: standardServiceMappings, + regions: []string{RegionUSGovEast1, RegionUSGovWest1}, + endpointServiceDomainPrefix: standardPartitionServiceDomainPrefix, + }, + { + name: PartitionChina, + serviceMappings: map[string]string{ + "EC2": "ec2.amazonaws.com.cn", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com", + }, + regions: []string{RegionCNNorth1, RegionCNNorthwest1}, + endpointServiceDomainPrefix: fmt.Sprintf("cn.%s", standardPartitionServiceDomainPrefix), + }, + { + name: PartitionISO, + serviceMappings: map[string]string{ + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com", + }, + regions: []string{RegionUSISOEast1, RegionUSISOWest1}, + endpointServiceDomainPrefix: "gov.ic.c2s", + }, + { + name: PartitionISOB, + serviceMappings: map[string]string{ + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com", + }, + regions: []string{RegionUSISOBEast1}, + endpointServiceDomainPrefix: "gov.sgov.sc2s", + }, +} + +// ForRegion returns the partition a region belongs to. +func (p partitions) ForRegion(region string) string { + for _, pt := range p { + for _, r := range pt.regions { + if r == region { + return pt.name + } + } + } + return PartitionAWS +} + +// GetEndpointServiceDomainPrefix returns the domain prefix for the endpoint service. +func (p partitions) GetEndpointServiceDomainPrefix(endpointService EndpointService, region string) string { + for _, pt := range p { + for _, r := range pt.regions { + if r == region { + switch pt.name { + case PartitionChina: + if endpointService.RequiresChinaPrefix { + return pt.endpointServiceDomainPrefix + } + return standardPartitionServiceDomainPrefix + case PartitionISO, PartitionISOB: + if endpointService.RequiresISOPrefix { + return pt.endpointServiceDomainPrefix + } + return standardPartitionServiceDomainPrefix + default: + return pt.endpointServiceDomainPrefix + } + } + } + } + return awsPartition.endpointServiceDomainPrefix +} + +// IsSupported returns true if the partition is supported. +func (p partitions) IsSupported(partition string) bool { + for _, pt := range p { + if pt.name == partition { + return true + } + } + return false +} + +// ServicePrincipalPartitionMappings returns the service principal partition mappings for all supported partitions. +func (p partitions) ServicePrincipalPartitionMappings() map[string]map[string]string { + ret := make(map[string]map[string]string, len(p)) + for _, pt := range p { + ret[pt.name] = pt.serviceMappings + } + return ret +} diff --git a/pkg/apis/eksctl.io/v1alpha5/types.go b/pkg/apis/eksctl.io/v1alpha5/types.go index ce5566dcf0..09b5fcefd6 100644 --- a/pkg/apis/eksctl.io/v1alpha5/types.go +++ b/pkg/apis/eksctl.io/v1alpha5/types.go @@ -17,8 +17,6 @@ import ( v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sts" - "github.com/aws/aws-sdk-go/aws/client" - "github.com/aws/aws-sdk-go/aws/session" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,8 +29,6 @@ import ( // Values for `KubernetesVersion` // All valid values should go in this block const ( - Version1_22 = "1.22" - Version1_23 = "1.23" Version1_24 = "1.24" @@ -43,10 +39,12 @@ const ( Version1_27 = "1.27" + Version1_28 = "1.28" + // DefaultVersion (default) - DefaultVersion = Version1_25 + DefaultVersion = Version1_27 - LatestVersion = Version1_27 + LatestVersion = Version1_28 DockershimDeprecationVersion = Version1_24 ) @@ -88,12 +86,15 @@ const ( // Version1_21 represents Kubernetes version 1.21.x Version1_21 = "1.21" + + // Version1_22 represents Kubernetes version 1.22.x + Version1_22 = "1.22" ) // Not yet supported versions const ( - // Version1_28 represents Kubernetes version 1.28.x - Version1_28 = "1.28" + // Version1_29 represents Kubernetes version 1.29.x + Version1_29 = "1.29" ) const ( @@ -190,23 +191,28 @@ const ( // RegionCNNorth1 represents the China region Beijing RegionCNNorth1 = "cn-north-1" + // RegionILCentral1 represents the Israel region Tel Aviv + RegionILCentral1 = "il-central-1" + // RegionUSGovWest1 represents the region GovCloud (US-West) RegionUSGovWest1 = "us-gov-west-1" // RegionUSGovEast1 represents the region GovCloud (US-East) RegionUSGovEast1 = "us-gov-east-1" + // RegionUSISOEast1 represents the region US ISO East. + RegionUSISOEast1 = "us-iso-east-1" + + // RegionUSISOBEast1 represents the region US ISOB East (Ohio). + RegionUSISOBEast1 = "us-isob-east-1" + + // RegionUSISOWest1 represents the region US ISOB West. + RegionUSISOWest1 = "us-iso-west-1" + // DefaultRegion defines the default region, where to deploy the EKS cluster DefaultRegion = RegionUSWest2 ) -// Partitions -const ( - PartitionAWS = "aws" - PartitionChina = "aws-cn" - PartitionUSGov = "aws-us-gov" -) - // Values for `NodeAMIFamily` // All valid values of supported families should go in this block const ( @@ -355,8 +361,19 @@ const ( // eksResourceAccountAPSouthEast3 defines the AWS EKS account ID that provides node resources in ap-southeast-3 eksResourceAccountAPSouthEast3 = "296578399912" + // eksResourceAccountILCentral1 defines the AWS EKS account ID that provides node resources in il-central-1 + eksResourceAccountILCentral1 = "066635153087" + // eksResourceAccountAPSouthEast4 defines the AWS EKS account ID that provides node resources in ap-southeast-4 eksResourceAccountAPSouthEast4 = "491585149902" + // eksResourceAccountUSISOEast1 defines the AWS EKS account ID that provides node resources in us-iso-east-1 + eksResourceAccountUSISOEast1 = "725322719131" + + // eksResourceAccountUSISOBEast1 defines the AWS EKS account ID that provides node resources in us-isob-east-1 + eksResourceAccountUSISOBEast1 = "187977181151" + + // eksResourceAccountUSISOWest1 defines the AWS EKS account ID that provides node resources in us-iso-west-1 + eksResourceAccountUSISOWest1 = "608367168043" ) // Values for `VolumeType` @@ -406,6 +423,7 @@ const ( KubeProxyAddon = "kube-proxy" CoreDNSAddon = "coredns" AWSEBSCSIDriverAddon = "aws-ebs-csi-driver" + AWSEFSCSIDriverAddon = "aws-efs-csi-driver" ) // supported version of Karpenter @@ -497,20 +515,12 @@ func SupportedRegions() []string { RegionAFSouth1, RegionCNNorthwest1, RegionCNNorth1, + RegionILCentral1, RegionUSGovWest1, RegionUSGovEast1, - } -} - -// Partition gives the partition a region belongs to -func Partition(region string) string { - switch region { - case RegionUSGovWest1, RegionUSGovEast1: - return PartitionUSGov - case RegionCNNorth1, RegionCNNorthwest1: - return PartitionChina - default: - return PartitionAWS + RegionUSISOEast1, + RegionUSISOBEast1, + RegionUSISOWest1, } } @@ -531,6 +541,7 @@ func DeprecatedVersions() []string { Version1_19, Version1_20, Version1_21, + Version1_22, } } @@ -547,12 +558,12 @@ func IsDeprecatedVersion(version string) bool { // SupportedVersions are the versions of Kubernetes that EKS supports func SupportedVersions() []string { return []string{ - Version1_22, Version1_23, Version1_24, Version1_25, Version1_26, Version1_27, + Version1_28, } } @@ -634,6 +645,14 @@ func EKSResourceAccountID(region string) string { return eksResourceAccountAPSouthEast3 case RegionAPSouthEast4: return eksResourceAccountAPSouthEast4 + case RegionILCentral1: + return eksResourceAccountILCentral1 + case RegionUSISOEast1: + return eksResourceAccountUSISOEast1 + case RegionUSISOBEast1: + return eksResourceAccountUSISOBEast1 + case RegionUSISOWest1: + return eksResourceAccountUSISOWest1 default: return eksResourceAccountStandard } @@ -792,8 +811,8 @@ type ClusterProvider interface { Region() string Profile() Profile WaitTimeout() time.Duration - ConfigProvider() client.ConfigProvider - Session() *session.Session + CredentialsProvider() aws.CredentialsProvider + AWSConfig() aws.Config ELB() awsapi.ELB ELBV2() awsapi.ELBV2 @@ -938,6 +957,9 @@ type OutpostInfo interface { GetOutpost() *Outpost } +// ErrUnsupportedLocalCluster is an error for when an unsupported operation is attempted on a local cluster. +var ErrUnsupportedLocalCluster = errors.New("this operation is not supported on Outposts clusters") + // Karpenter provides configuration options type Karpenter struct { // Version defines the Karpenter version to install diff --git a/pkg/apis/eksctl.io/v1alpha5/validation.go b/pkg/apis/eksctl.io/v1alpha5/validation.go index 091db0709e..fd5d1c5e2f 100644 --- a/pkg/apis/eksctl.io/v1alpha5/validation.go +++ b/pkg/apis/eksctl.io/v1alpha5/validation.go @@ -790,14 +790,14 @@ func ValidateNodeGroup(i int, ng *NodeGroup, cfg *ClusterConfig) error { } if ng.AMI != "" && ng.OverrideBootstrapCommand == nil && ng.AMIFamily != NodeImageFamilyBottlerocket && !IsWindowsImage(ng.AMIFamily) { - return errors.Errorf("%[1]s.overrideBootstrapCommand is required when using a custom AMI (%[1]s.ami)", path) + return errors.Errorf("%[1]s.overrideBootstrapCommand is required when using a custom AMI based on %s (%[1]s.ami)", path, ng.AMIFamily) } if err := validateTaints(ng.Taints); err != nil { return err } - if err := validateNodeGroupLabels(ng.Labels); err != nil { + if err := validateLabels(ng.Labels); err != nil { return err } @@ -807,42 +807,37 @@ func ValidateNodeGroup(i int, ng *NodeGroup, cfg *ClusterConfig) error { } } - if IsWindowsImage(ng.AMIFamily) || ng.AMIFamily == NodeImageFamilyBottlerocket { - fieldNotSupported := func(field string) error { - return &unsupportedFieldError{ - ng: ng.NodeGroupBase, - path: path, - field: field, - } + fieldNotSupported := func(field string) error { + return &unsupportedFieldError{ + ng: ng.NodeGroupBase, + path: path, + field: field, } + } + if IsWindowsImage(ng.AMIFamily) { if ng.KubeletExtraConfig != nil { return fieldNotSupported("kubeletExtraConfig") } - - if IsWindowsImage(ng.AMIFamily) && ng.OverrideBootstrapCommand != nil { + } else if ng.AMIFamily == NodeImageFamilyBottlerocket { + if ng.KubeletExtraConfig != nil { + return fieldNotSupported("kubeletExtraConfig") + } + if ng.PreBootstrapCommands != nil { + return fieldNotSupported("preBootstrapCommands") + } + if ng.OverrideBootstrapCommand != nil { return fieldNotSupported("overrideBootstrapCommand") } - - if ng.AMIFamily == NodeImageFamilyBottlerocket { - if ng.PreBootstrapCommands != nil { - return fieldNotSupported("preBootstrapCommands") - } - if ng.OverrideBootstrapCommand != nil { - return fieldNotSupported("overrideBootstrapCommand") + if ng.Bottlerocket != nil && ng.Bottlerocket.Settings != nil { + if err := checkBottlerocketSettings(ng, path); err != nil { + return err } } } else if err := validateNodeGroupKubeletExtraConfig(ng.KubeletExtraConfig); err != nil { return err } - if ng.AMIFamily == NodeImageFamilyBottlerocket && ng.Bottlerocket != nil { - err := checkBottlerocketSettings(ng.Bottlerocket.Settings, path) - if err != nil { - return err - } - } - if instanceutils.IsARMGPUInstanceType(SelectInstanceType(ng)) && ng.AMIFamily != NodeImageFamilyBottlerocket { return fmt.Errorf("ARM GPU instance types are not supported for unmanaged nodegroups with AMIFamily %s", ng.AMIFamily) } @@ -923,16 +918,16 @@ func validateOutpostARN(val string) error { return nil } -// validateNodeGroupLabels uses proper Kubernetes label validation, -// it's designed to make sure users don't pass weird labels to the -// nodes, which would prevent kubelets to startup properly -func validateNodeGroupLabels(labels map[string]string) error { +// validateLabels uses proper Kubernetes label validation, +// it's designed to make sure users don't pass invalid or disallowed labels, +// which would prevent kubelets to startup properly +func validateLabels(labels map[string]string) error { // compact version based on: // - https://github.com/kubernetes/kubernetes/blob/v1.13.2/cmd/kubelet/app/options/options.go#L257-L267 // - https://github.com/kubernetes/kubernetes/blob/v1.13.2/pkg/kubelet/apis/well_known_labels.go // we cannot import those packages because they break other dependencies - unknownKubernetesLabels := []string{} + disallowedKubernetesLabels := []string{} for label := range labels { labelParts := strings.Split(label, "/") @@ -951,13 +946,13 @@ func validateNodeGroupLabels(labels map[string]string) error { if len(labelParts) == 2 { namespace := labelParts[0] if isKubernetesLabel(namespace) && !kubeletapis.IsKubeletLabel(label) { - unknownKubernetesLabels = append(unknownKubernetesLabels, label) + disallowedKubernetesLabels = append(disallowedKubernetesLabels, label) } } } - if len(unknownKubernetesLabels) > 0 { - return fmt.Errorf("unknown 'kubernetes.io' or 'k8s.io' labels were specified: %v", unknownKubernetesLabels) + if len(disallowedKubernetesLabels) > 0 { + return fmt.Errorf("the following nodegroup labels are disallowed as they have reserved prefixes [kubernetes.io/, k8s.io/]: %v", disallowedKubernetesLabels) } return nil } @@ -1175,6 +1170,10 @@ func ValidateManagedNodeGroup(index int, ng *ManagedNodeGroup) error { return err } + if err := validateLabels(ng.Labels); err != nil { + return err + } + switch { case ng.LaunchTemplate != nil: if ng.LaunchTemplate.ID == "" { @@ -1212,11 +1211,11 @@ func ValidateManagedNodeGroup(index int, ng *ManagedNodeGroup) error { if ng.AMIFamily == "" { return errors.Errorf("when using a custom AMI, amiFamily needs to be explicitly set via config file or via --node-ami-family flag") } - if ng.AMIFamily != NodeImageFamilyAmazonLinux2 { - return errors.Errorf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s is supported", ng.AMIFamily, NodeImageFamilyAmazonLinux2) + if ng.AMIFamily != NodeImageFamilyAmazonLinux2 && ng.AMIFamily != NodeImageFamilyUbuntu1804 && ng.AMIFamily != NodeImageFamilyUbuntu2004 { + return errors.Errorf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s, %s and %s are supported", ng.AMIFamily, NodeImageFamilyAmazonLinux2, NodeImageFamilyUbuntu1804, NodeImageFamilyUbuntu2004) } if ng.OverrideBootstrapCommand == nil { - return errors.Errorf("%s.overrideBootstrapCommand is required when using a custom AMI (%s.ami)", path, path) + return errors.Errorf("%[1]s.overrideBootstrapCommand is required when using a custom AMI based on %s (%[1]s.ami)", path, ng.AMIFamily) } notSupportedWithCustomAMIErr := func(field string) error { return errors.Errorf("%s.%s is not supported when using a custom AMI (%s.ami)", path, field, path) @@ -1489,17 +1488,13 @@ func (fps FargateProfileSelector) Validate() error { return nil } -func checkBottlerocketSettings(doc *InlineDocument, path string) error { - if doc == nil { - return nil - } - - overlapErr := func(key, ngField string) error { - return errors.Errorf("invalid Bottlerocket setting: use %s.%s instead (path=%s)", path, ngField, key) +func checkBottlerocketSettings(ng *NodeGroup, path string) error { + overlapErr := func(kubernetesField, ngField string) error { + return fmt.Errorf("invalid Bottlerocket setting: use %[1]s.%[2]s instead (path=%[1]s.bottlerocket.settings.kubernetes.%[3]s)", path, ngField, kubernetesField) } // Dig into kubernetes settings if provided. - kubeVal, ok := (*doc)["kubernetes"] + kubeVal, ok := (*ng.Bottlerocket.Settings)["kubernetes"] if !ok { return nil } @@ -1510,19 +1505,22 @@ func checkBottlerocketSettings(doc *InlineDocument, path string) error { } checkMapping := map[string]string{ - "node-labels": "labels", - "node-taints": "taints", - "max-pods": "maxPodsPerNode", - "cluster-dns-ip": "clusterDNS", + "node-labels": "labels", + "node-taints": "taints", + "max-pods": "maxPodsPerNode", } for checkKey, shouldUse := range checkMapping { _, ok := kube[checkKey] if ok { - return overlapErr(path+".kubernetes."+checkKey, shouldUse) + return overlapErr(checkKey, shouldUse) } } + if _, ok := kube["cluster-dns-ip"]; ok && ng.ClusterDNS != "" { + return fmt.Errorf("only one of %[1]s.bottlerocket.settings.kubernetes.cluster-dns-ip or %[1]s.clusterDNS can be set", path) + } + return nil } diff --git a/pkg/apis/eksctl.io/v1alpha5/validation_test.go b/pkg/apis/eksctl.io/v1alpha5/validation_test.go index 87534146a4..ce3abd67d8 100644 --- a/pkg/apis/eksctl.io/v1alpha5/validation_test.go +++ b/pkg/apis/eksctl.io/v1alpha5/validation_test.go @@ -153,7 +153,8 @@ var _ = Describe("ClusterConfig validation", func() { ng0.Name = "node-group" ng0.AMI = "ami-1234" ng0.AMIFamily = api.NodeImageFamilyAmazonLinux2 - Expect(api.ValidateNodeGroup(0, ng0, cfg)).To(MatchError(ContainSubstring("overrideBootstrapCommand is required when using a custom AMI "))) + errMsg := fmt.Sprintf("overrideBootstrapCommand is required when using a custom AMI based on %s", ng0.AMIFamily) + Expect(api.ValidateNodeGroup(0, ng0, cfg)).To(MatchError(ContainSubstring(errMsg))) }) It("should not require overrideBootstrapCommand if ami is set and type is Bottlerocket", func() { cfg := api.NewClusterConfig() @@ -171,14 +172,14 @@ var _ = Describe("ClusterConfig validation", func() { ng0.AMIFamily = api.NodeImageFamilyWindowsServer2019CoreContainer Expect(api.ValidateNodeGroup(0, ng0, cfg)).To(Succeed()) }) - It("should throw an error if overrideBootstrapCommand is set and type is Windows", func() { + It("should not throw an error if overrideBootstrapCommand is set and type is Windows", func() { cfg := api.NewClusterConfig() ng0 := cfg.NewNodeGroup() ng0.Name = "node-group" ng0.AMI = "ami-1234" ng0.AMIFamily = api.NodeImageFamilyWindowsServer2019CoreContainer ng0.OverrideBootstrapCommand = aws.String("echo 'yo'") - Expect(api.ValidateNodeGroup(0, ng0, cfg)).To(MatchError(ContainSubstring("overrideBootstrapCommand is not supported for WindowsServer2019CoreContainer nodegroups"))) + Expect(api.ValidateNodeGroup(0, ng0, cfg)).To(Succeed()) }) It("should accept ami with a overrideBootstrapCommand set", func() { cfg := api.NewClusterConfig() @@ -1802,23 +1803,55 @@ var _ = Describe("ClusterConfig validation", func() { Expect(err).To(MatchError(ContainSubstring(`bottlerocket config can only be used with amiFamily "Bottlerocket"`))) }) - It("returns an error with unsupported fields", func() { - cmd := "/usr/bin/some-command" - doc := api.InlineDocument{ - "cgroupDriver": "systemd", - } + type bottlerocketEntry struct { + ng *api.NodeGroup + expectedErr string + } - ngs := map[string]*api.NodeGroup{ - "PreBootstrapCommands": { + DescribeTable("field validation", func(be bottlerocketEntry) { + if be.ng.NodeGroupBase == nil { + be.ng.NodeGroupBase = &api.NodeGroupBase{} + } + be.ng.AMIFamily = api.NodeImageFamilyBottlerocket + err := api.ValidateNodeGroup(0, be.ng, api.NewClusterConfig()) + if be.expectedErr != "" { + Expect(err).To(MatchError(be.expectedErr)) + } else { + Expect(err).NotTo(HaveOccurred()) + } + }, + Entry("preBootstrapCommands", bottlerocketEntry{ + ng: &api.NodeGroup{ NodeGroupBase: &api.NodeGroupBase{ PreBootstrapCommands: []string{"/usr/bin/env true"}, - }}, - "OverrideBootstrapCommand": { + }, + }, + + expectedErr: "preBootstrapCommands is not supported for Bottlerocket nodegroups (path=nodeGroups[0].preBootstrapCommands)", + }), + + Entry("overrideBootstrapCommand", bottlerocketEntry{ + ng: &api.NodeGroup{ NodeGroupBase: &api.NodeGroupBase{ - OverrideBootstrapCommand: &cmd, - }}, - "KubeletExtraConfig": {KubeletExtraConfig: &doc}, - "overlapping Bottlerocket settings": { + OverrideBootstrapCommand: aws.String("/usr/bin/some-command"), + }, + }, + + expectedErr: "overrideBootstrapCommand is not supported for Bottlerocket nodegroups (path=nodeGroups[0].overrideBootstrapCommand)", + }), + + Entry("kubeletExtraConfig", bottlerocketEntry{ + ng: &api.NodeGroup{ + KubeletExtraConfig: &api.InlineDocument{ + "cgroupDriver": "systemd", + }, + }, + + expectedErr: "kubeletExtraConfig is not supported for Bottlerocket nodegroups (path=nodeGroups[0].kubeletExtraConfig)", + }), + + Entry("overlapping settings", bottlerocketEntry{ + ng: &api.NodeGroup{ NodeGroupBase: &api.NodeGroupBase{ Bottlerocket: &api.NodeGroupBottlerocket{ Settings: &api.InlineDocument{ @@ -1831,39 +1864,49 @@ var _ = Describe("ClusterConfig validation", func() { }, }, }, - } - cfg := api.NewClusterConfig() - for name, ng := range ngs { - if ng.NodeGroupBase == nil { - ng.NodeGroupBase = &api.NodeGroupBase{} - } - ng.AMIFamily = api.NodeImageFamilyBottlerocket - err := api.ValidateNodeGroup(0, ng, cfg) - Expect(err).To(HaveOccurred(), "foo", name) - } - }) + expectedErr: "invalid Bottlerocket setting: use nodeGroups[0].labels instead (path=nodeGroups[0].bottlerocket.settings.kubernetes.node-labels)", + }), - It("has no error with supported fields", func() { - x := 32 - ngs := []*api.NodeGroup{ - {NodeGroupBase: &api.NodeGroupBase{Labels: map[string]string{"label": "label-value"}}}, - {NodeGroupBase: &api.NodeGroupBase{MaxPodsPerNode: x}}, - { + Entry("both clusterDNS and cluster-dns-ip set", bottlerocketEntry{ + ng: &api.NodeGroup{ NodeGroupBase: &api.NodeGroupBase{ - ScalingConfig: &api.ScalingConfig{ - MinSize: &x, + Bottlerocket: &api.NodeGroupBottlerocket{ + Settings: &api.InlineDocument{ + "kubernetes": map[string]interface{}{ + "cluster-dns-ip": "10.100.0.10", + }, + }, }, }, + ClusterDNS: "10.100.0.10", }, - } - cfg := api.NewClusterConfig() - for i, ng := range ngs { - ng.AMIFamily = api.NodeImageFamilyBottlerocket - Expect(api.ValidateNodeGroup(i, ng, cfg)).To(Succeed()) - } - }) + expectedErr: "only one of nodeGroups[0].bottlerocket.settings.kubernetes.cluster-dns-ip or nodeGroups[0].clusterDNS can be set", + }), + + Entry("labels", bottlerocketEntry{ + ng: &api.NodeGroup{ + NodeGroupBase: &api.NodeGroupBase{Labels: map[string]string{"label": "label-value"}}, + }, + }), + + Entry("maxPods", bottlerocketEntry{ + ng: &api.NodeGroup{ + NodeGroupBase: &api.NodeGroupBase{MaxPodsPerNode: 32}, + }, + }), + + Entry("maxPods", bottlerocketEntry{ + ng: &api.NodeGroup{ + NodeGroupBase: &api.NodeGroupBase{ + ScalingConfig: &api.ScalingConfig{ + MinSize: aws.Int(5), + }, + }, + }, + }), + ) }) type kmsFieldCase struct { @@ -1927,6 +1970,30 @@ var _ = Describe("ClusterConfig validation", func() { Expect(err).To(MatchError("AMI Family SomeTrash is not supported - use one of: AmazonLinux2, Ubuntu2004, Ubuntu1804, Bottlerocket, WindowsServer2019CoreContainer, WindowsServer2019FullContainer, WindowsServer2022CoreContainer, WindowsServer2022FullContainer")) }) + It("fails when the AmiFamily is not supported for managed nodes with custom AMI", func() { + mng := api.NewManagedNodeGroup() + mng.AMI = "ami-1234" + mng.OverrideBootstrapCommand = aws.String("bootstrap command") + + mng.AMIFamily = api.NodeImageFamilyAmazonLinux2 + err := api.ValidateManagedNodeGroup(0, mng) + Expect(err).NotTo(HaveOccurred()) + + mng.AMIFamily = api.NodeImageFamilyUbuntu1804 + err = api.ValidateManagedNodeGroup(0, mng) + Expect(err).NotTo(HaveOccurred()) + + mng.AMIFamily = api.NodeImageFamilyUbuntu2004 + err = api.ValidateManagedNodeGroup(0, mng) + Expect(err).NotTo(HaveOccurred()) + + mng.AMIFamily = api.NodeImageFamilyBottlerocket + mng.OverrideBootstrapCommand = nil + err = api.ValidateManagedNodeGroup(0, mng) + errorMsg := fmt.Sprintf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s, %s and %s are supported", mng.AMIFamily, api.NodeImageFamilyAmazonLinux2, api.NodeImageFamilyUbuntu1804, api.NodeImageFamilyUbuntu2004) + Expect(err).To(MatchError(errorMsg)) + }) + It("fails when the AMIFamily is WindowsServer2004CoreContainer", func() { ng.AMIFamily = api.NodeImageFamilyWindowsServer2004CoreContainer err := api.ValidateNodeGroup(0, ng, cfg) @@ -2019,12 +2086,24 @@ var _ = Describe("ClusterConfig validation", func() { ng := newNodeGroup() ng.Labels = e.labels ng.Taints = e.taints + + mng := api.NewManagedNodeGroup() + mng.Labels = e.labels + mng.Taints = e.taints + err := api.ValidateNodeGroup(0, ng, api.NewClusterConfig()) if e.valid { Expect(err).NotTo(HaveOccurred()) } else { Expect(err).To(HaveOccurred()) } + + err = api.ValidateManagedNodeGroup(0, mng) + if e.valid { + Expect(err).NotTo(HaveOccurred()) + } else { + Expect(err).To(HaveOccurred()) + } }, Entry("disallowed label", labelsTaintsEntry{ labels: map[string]string{ diff --git a/pkg/apis/eksctl.io/v1alpha5/vpc.go b/pkg/apis/eksctl.io/v1alpha5/vpc.go index 29dc8e8edd..3ed1ccdb8d 100644 --- a/pkg/apis/eksctl.io/v1alpha5/vpc.go +++ b/pkg/apis/eksctl.io/v1alpha5/vpc.go @@ -268,75 +268,95 @@ func DefaultCIDR() ipnet.IPNet { // // If a user specifies a subnet by AZ without CIDR and ID but multiple subnets // exist in this VPC, one will be arbitrarily chosen. -func ImportSubnet(subnets AZSubnetMapping, subnet *ec2types.Subnet, makeSubnetAlias func(*ec2types.Subnet) string) error { - if subnets == nil { +func ImportSubnet(subnets AZSubnetMapping, localSubnetsConfig AZSubnetMapping, subnet *ec2types.Subnet, makeSubnetAlias func(*ec2types.Subnet) string) error { + if localSubnetsConfig == nil { return nil } - subnetCIDR, err := ipnet.ParseCIDR(*subnet.CidrBlock) + remoteSubnet, err := remoteSubnetToAZSubnetSpec(subnet) if err != nil { - return fmt.Errorf("unexpected error parsing subnet CIDR %q: %w", *subnet.CidrBlock, err) - } - - var ( - subnetID = *subnet.SubnetId - az = *subnet.AvailabilityZone - ) - - subnetAlias := makeSubnetAlias(subnet) - if network, ok := subnets[subnetAlias]; !ok { - newS := AZSubnetSpec{ID: subnetID, AZ: az, CIDR: subnetCIDR} - // Used if we find an exact ID match - var idKey string - // Used if we match to AZ/CIDR - var guessKey string - for k, s := range subnets { - if s.ID == "" { - if s.AZ != az || (s.CIDR.String() != "" && s.CIDR.String() != subnetCIDR.String()) { - continue - } - if guessKey != "" { - return fmt.Errorf("unable to unambiguously import subnet, found both %s and %s", guessKey, k) - } - guessKey = k - } else if s.ID == subnetID { - if s.CIDR.String() != "" && s.CIDR.String() != subnetCIDR.String() { - return fmt.Errorf("subnet CIDR %q is not the same as %q", s.CIDR.String(), subnetCIDR.String()) - } - if idKey != "" { - return fmt.Errorf("unable to unambiguously import subnet, found both %s and %s", idKey, k) - } - idKey = k - } - } - if idKey != "" { - subnets[idKey] = newS - } else if guessKey != "" { - subnets[guessKey] = newS - } else { - if subnet.OutpostArn != nil { - newS.OutpostARN = *subnet.OutpostArn - } - subnets[subnetAlias] = newS - } - } else { - if network.ID == "" { - network.ID = subnetID - } else if network.ID != subnetID { - return fmt.Errorf("subnet ID %q is not the same as %q", network.ID, subnetID) + return err + } + + // if a VPC config was provided as part of the config file, + // we need to validate it against the remote config + // and return an error in case of mismatch + subnetKey, err := validateLocalConfigAgainstRemote(localSubnetsConfig, remoteSubnet, makeSubnetAlias(subnet)) + if err != nil { + return fmt.Errorf("mismatch found between local and remote VPC config: %w", err) + } + + subnets[subnetKey] = remoteSubnet + + return nil +} + +func validateLocalConfigAgainstRemote(localSubnetsConfig AZSubnetMapping, remoteSubnet AZSubnetSpec, subnetAlias string) (string, error) { + if len(localSubnetsConfig) == 0 { + return subnetAlias, nil + } + + // if the subnet is found by alias in config file, validate ID and CIDR + if localSubnet, ok := localSubnetsConfig[subnetAlias]; ok { + if localSubnet.ID != "" && localSubnet.ID != remoteSubnet.ID { + return "", fmt.Errorf("subnet ID %q, found in config file, is not the same as subnet ID %q, found in remote VPC config", localSubnet.ID, remoteSubnet.ID) } - if network.CIDR == nil { - network.CIDR = subnetCIDR - } else if network.CIDR.String() != subnetCIDR.String() { - return fmt.Errorf("subnet CIDR %q is not the same as %q", network.CIDR.String(), subnetCIDR.String()) + if localSubnet.CIDR.String() != "" && localSubnet.CIDR.String() != remoteSubnet.CIDR.String() { + return "", fmt.Errorf("subnet CIDR %q, found in config file, is not the same as subnet CIDR %q, found in remote VPC config", localSubnet.CIDR.String(), remoteSubnet.CIDR.String()) } - network.AZ = az - if subnet.OutpostArn != nil { - network.OutpostARN = *subnet.OutpostArn + return subnetAlias, nil + } + + // otherwise look up the remote subnet by ID or pair + var foundByIDKey string + var foundByAZCIDRKey string + for k, s := range localSubnetsConfig { + if s.ID == remoteSubnet.ID { + if s.CIDR.String() != "" && s.CIDR.String() != remoteSubnet.CIDR.String() { + return "", fmt.Errorf("subnet CIDR %q, found in config file, is not the same as subnet CIDR %q, found in remote VPC config", s.CIDR.String(), remoteSubnet.CIDR.String()) + } + if foundByIDKey != "" { + return "", fmt.Errorf("unable to unambiguously import subnet by ID, found both %s and %s", foundByIDKey, k) + } + foundByIDKey = k + } else if s.ID == "" { + if s.AZ != remoteSubnet.AZ || (s.CIDR.String() != "" && s.CIDR.String() != remoteSubnet.CIDR.String()) { + continue + } + if foundByAZCIDRKey != "" { + return "", fmt.Errorf("unable to unambiguously import subnet by pair, found both %s and %s", foundByAZCIDRKey, k) + } + foundByAZCIDRKey = k } - subnets[subnetAlias] = network } - return nil + + if foundByIDKey != "" { + return foundByIDKey, nil + } + if foundByAZCIDRKey != "" { + return foundByAZCIDRKey, nil + } + + return subnetAlias, nil +} + +func remoteSubnetToAZSubnetSpec(subnet *ec2types.Subnet) (AZSubnetSpec, error) { + subnetCIDR, err := ipnet.ParseCIDR(*subnet.CidrBlock) + if err != nil { + return AZSubnetSpec{}, fmt.Errorf("unexpected error parsing subnet CIDR %q: %w", *subnet.CidrBlock, err) + } + + subnetSpec := AZSubnetSpec{ + ID: *subnet.SubnetId, + AZ: *subnet.AvailabilityZone, + CIDR: subnetCIDR, + } + + if subnet.OutpostArn != nil { + subnetSpec.OutpostARN = *subnet.OutpostArn + } + + return subnetSpec, nil } // SelectOutpostSubnetIDs returns all subnets that are on Outposts. diff --git a/pkg/apis/eksctl.io/v1alpha5/vpc_test.go b/pkg/apis/eksctl.io/v1alpha5/vpc_test.go index cc143e9921..27bfa3f295 100644 --- a/pkg/apis/eksctl.io/v1alpha5/vpc_test.go +++ b/pkg/apis/eksctl.io/v1alpha5/vpc_test.go @@ -18,36 +18,39 @@ type endpointAccessCase struct { } type subnetCase struct { - subnets AZSubnetMapping - az string - subnetID string - cidr string - err bool - expected AZSubnetMapping + subnets AZSubnetMapping + localSubnetsConfig AZSubnetMapping + az string + subnetID string + cidr string + err string + expected AZSubnetMapping } var _ = Describe("VPC Configuration", func() { DescribeTable("Subnet import", func(e subnetCase) { - err := ImportSubnet(e.subnets, &ec2types.Subnet{ + err := ImportSubnet(e.subnets, e.localSubnetsConfig, &ec2types.Subnet{ AvailabilityZone: aws.String(e.az), SubnetId: aws.String(e.subnetID), CidrBlock: aws.String(e.cidr), }, func(subnet *ec2types.Subnet) string { return *subnet.AvailabilityZone }) - if e.err { + if e.err != "" { Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring(e.err)) } else { Expect(err).NotTo(HaveOccurred()) Expect(e.subnets).To(Equal(e.expected)) } }, Entry("No subnets", subnetCase{ - subnets: NewAZSubnetMapping(), - az: "us-east-1a", - subnetID: "subnet-1", - cidr: "192.168.0.0/16", + subnets: NewAZSubnetMapping(), + localSubnetsConfig: NewAZSubnetMapping(), + az: "us-east-1a", + subnetID: "subnet-1", + cidr: "192.168.0.0/16", expected: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ "us-east-1a": { AZ: "us-east-1a", @@ -60,6 +63,9 @@ var _ = Describe("VPC Configuration", func() { subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ "us-east-1a": {}, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": {}, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/16", @@ -77,6 +83,11 @@ var _ = Describe("VPC Configuration", func() { ID: "subnet-1", }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": { + ID: "subnet-1", + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/16", @@ -94,6 +105,11 @@ var _ = Describe("VPC Configuration", func() { ID: "subnet-1", }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + ID: "subnet-1", + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/24", @@ -105,16 +121,39 @@ var _ = Describe("VPC Configuration", func() { }, }), }), - Entry("Conflicting existing subnets", subnetCase{ + Entry("Conflicting existing subnets by ID", subnetCase{ subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ "us-east-1a": { ID: "subnet-2", }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": { + ID: "subnet-2", + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/16", - err: true, + err: "mismatch found between local and remote VPC config: subnet ID", + }), + Entry("Conflicting existing subnets by CIDR", subnetCase{ + subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": { + ID: "subnet-1", + CIDR: ipnet.MustParseCIDR("192.168.1.0/24"), + }, + }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": { + ID: "subnet-1", + CIDR: ipnet.MustParseCIDR("192.168.1.0/24"), + }, + }), + az: "us-east-1a", + subnetID: "subnet-1", + cidr: "192.168.0.0/16", + err: "mismatch found between local and remote VPC config: subnet CIDR", }), Entry("Named subnets placeholder", subnetCase{ subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ @@ -122,6 +161,11 @@ var _ = Describe("VPC Configuration", func() { AZ: "us-east-1a", }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + AZ: "us-east-1a", + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/16", @@ -133,7 +177,29 @@ var _ = Describe("VPC Configuration", func() { }, }), }), - Entry("Ambiguous list", subnetCase{ + Entry("Ambiguous ID list", subnetCase{ + subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + ID: "subnet-1", + }, + "other-subnet": { + ID: "subnet-1", + }, + }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + ID: "subnet-1", + }, + "other-subnet": { + ID: "subnet-1", + }, + }), + az: "us-east-1a", + subnetID: "subnet-1", + cidr: "192.168.0.0/16", + err: "mismatch found between local and remote VPC config: unable to unambiguously import subnet by ID", + }), + Entry("Ambiguous CIDR+AZ list", subnetCase{ subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ "main-subnet": { AZ: "us-east-1a", @@ -142,10 +208,18 @@ var _ = Describe("VPC Configuration", func() { AZ: "us-east-1a", }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + AZ: "us-east-1a", + }, + "other-subnet": { + AZ: "us-east-1a", + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/16", - err: true, + err: "mismatch found between local and remote VPC config: unable to unambiguously import subnet by pair", }), Entry("CIDR+AZ differentiated list", subnetCase{ subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ @@ -158,6 +232,16 @@ var _ = Describe("VPC Configuration", func() { CIDR: ipnet.MustParseCIDR("192.168.1.0/24"), }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + AZ: "us-east-1a", + CIDR: ipnet.MustParseCIDR("192.168.0.0/24"), + }, + "other-subnet": { + AZ: "us-east-1a", + CIDR: ipnet.MustParseCIDR("192.168.1.0/24"), + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/24", @@ -183,6 +267,15 @@ var _ = Describe("VPC Configuration", func() { AZ: "us-east-1a", }, }), + localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "main-subnet": { + AZ: "us-east-1a", + ID: "subnet-1", + }, + "other-subnet": { + AZ: "us-east-1a", + }, + }), az: "us-east-1a", subnetID: "subnet-1", cidr: "192.168.0.0/24", @@ -197,6 +290,24 @@ var _ = Describe("VPC Configuration", func() { }, }), }), + Entry("Two subnets in same AZ, without VPC config provided", subnetCase{ + subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": { + ID: "subnet-1", + CIDR: ipnet.MustParseCIDR("192.168.0.0/24"), + }, + }), + localSubnetsConfig: NewAZSubnetMapping(), + az: "us-east-1a", + subnetID: "subnet-2", + cidr: "192.168.32.0/26", + expected: AZSubnetMappingFromMap(map[string]AZSubnetSpec{ + "us-east-1a": { + ID: "subnet-2", + CIDR: ipnet.MustParseCIDR("192.168.32.0/26"), + }, + }), + }), ) DescribeTable("Can determine if VPC config in config file has cluster endpoints", func(e endpointAccessCase) { diff --git a/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go b/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go index 29e34cd08e..90ec1476ea 100644 --- a/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go +++ b/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go @@ -2,7 +2,9 @@ // +build !ignore_autogenerated /* -Copyright 2018 Weaveworks. All rights reserved. +Copyright 2018 Weaveworks. +Copyright 2023 The eksctl Authors. +All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/awsapi/autoscaling.go b/pkg/awsapi/autoscaling.go index 441b1d8b70..6a87e9b3eb 100644 --- a/pkg/awsapi/autoscaling.go +++ b/pkg/awsapi/autoscaling.go @@ -104,7 +104,7 @@ type ASG interface { // - If you finish before the timeout period ends, send a callback by using the // CompleteLifecycleAction API call. // - // For more information, see Amazon EC2 Auto Scaling lifecycle hooks (https://docs.aws.amazon.com/autoscaling/ec2/userguide/lifecycle-hooks.html) + // For more information, see Complete a lifecycle action (https://docs.aws.amazon.com/autoscaling/ec2/userguide/completing-lifecycle-hooks.html) // in the Amazon EC2 Auto Scaling User Guide. CompleteLifecycleAction(ctx context.Context, params *CompleteLifecycleActionInput, optFns ...func(*Options)) (*CompleteLifecycleActionOutput, error) // We strongly recommend using a launch template when calling this operation to @@ -376,10 +376,10 @@ type ASG interface { // balancer using the DescribeLoadBalancers API call. The instances remain running. DetachLoadBalancers(ctx context.Context, params *DetachLoadBalancersInput, optFns ...func(*Options)) (*DetachLoadBalancersOutput, error) // Detaches one or more traffic sources from the specified Auto Scaling group. - // When you detach a taffic, it enters the Removing state while deregistering the - // instances in the group. When all instances are deregistered, then you can no - // longer describe the traffic source using the DescribeTrafficSources API call. - // The instances continue to run. + // When you detach a traffic source, it enters the Removing state while + // deregistering the instances in the group. When all instances are deregistered, + // then you can no longer describe the traffic source using the + // DescribeTrafficSources API call. The instances continue to run. DetachTrafficSources(ctx context.Context, params *DetachTrafficSourcesInput, optFns ...func(*Options)) (*DetachTrafficSourcesOutput, error) // Disables group metrics collection for the specified Auto Scaling group. DisableMetricsCollection(ctx context.Context, params *DisableMetricsCollectionInput, optFns ...func(*Options)) (*DisableMetricsCollectionOutput, error) diff --git a/pkg/awsapi/cloudformation.go b/pkg/awsapi/cloudformation.go index 91a874ca80..7afbb3a839 100644 --- a/pkg/awsapi/cloudformation.go +++ b/pkg/awsapi/cloudformation.go @@ -329,6 +329,11 @@ type CloudFormation interface { // Fn::ImportValue (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-importvalue.html) // function. ListImports(ctx context.Context, params *ListImportsInput, optFns ...func(*Options)) (*ListImportsOutput, error) + // Returns drift information for resources in a stack instance. + // ListStackInstanceResourceDrifts returns drift information for the most recent + // drift detection operation. If an operation is in progress, it may only return + // partial results. + ListStackInstanceResourceDrifts(ctx context.Context, params *ListStackInstanceResourceDriftsInput, optFns ...func(*Options)) (*ListStackInstanceResourceDriftsOutput, error) // Returns summary information about stack instances that are associated with the // specified stack set. You can filter for stack instances that are associated with // a specific Amazon Web Services account name or Region, or that have a specific diff --git a/pkg/awsapi/cloudtrail.go b/pkg/awsapi/cloudtrail.go index 25c9124acf..355b7bb5eb 100644 --- a/pkg/awsapi/cloudtrail.go +++ b/pkg/awsapi/cloudtrail.go @@ -56,8 +56,11 @@ type CloudTrail interface { // an organization. DeregisterOrganizationDelegatedAdmin(ctx context.Context, params *DeregisterOrganizationDelegatedAdminInput, optFns ...func(*Options)) (*DeregisterOrganizationDelegatedAdminOutput, error) // Returns metadata about a query, including query run time in milliseconds, - // number of events scanned and matched, and query status. You must specify an ARN - // for EventDataStore , and a value for QueryID . + // number of events scanned and matched, and query status. If the query results + // were delivered to an S3 bucket, the response also provides the S3 URI and the + // delivery status. You must specify either a QueryID or a QueryAlias . Specifying + // the QueryAlias parameter returns information about the last query run for the + // alias. DescribeQuery(ctx context.Context, params *DescribeQueryInput, optFns ...func(*Options)) (*DescribeQueryOutput, error) // Retrieves settings for one or more trails associated with the current Region // for your account. @@ -92,7 +95,7 @@ type CloudTrail interface { // in the CloudTrail User Guide. GetInsightSelectors(ctx context.Context, params *GetInsightSelectorsInput, optFns ...func(*Options)) (*GetInsightSelectorsOutput, error) // Gets event data results of a query. You must specify the QueryID value returned - // by the StartQuery operation, and an ARN for EventDataStore . + // by the StartQuery operation. GetQueryResults(ctx context.Context, params *GetQueryResultsInput, optFns ...func(*Options)) (*GetQueryResultsOutput, error) // Retrieves the JSON text of the resource-based policy document attached to the // CloudTrail channel. @@ -250,9 +253,13 @@ type CloudTrail interface { // called on the shadow trails (replicated trails in other Regions) of a trail that // is enabled in all Regions. StartLogging(ctx context.Context, params *StartLoggingInput, optFns ...func(*Options)) (*StartLoggingOutput, error) - // Starts a CloudTrail Lake query. The required QueryStatement parameter provides + // Starts a CloudTrail Lake query. Use the QueryStatement parameter to provide // your SQL query, enclosed in single quotation marks. Use the optional - // DeliveryS3Uri parameter to deliver the query results to an S3 bucket. + // DeliveryS3Uri parameter to deliver the query results to an S3 bucket. StartQuery + // requires you specify either the QueryStatement parameter, or a QueryAlias and + // any QueryParameters . In the current release, the QueryAlias and QueryParameters + // parameters are used only for the queries that populate the CloudTrail Lake + // dashboards. StartQuery(ctx context.Context, params *StartQueryInput, optFns ...func(*Options)) (*StartQueryOutput, error) // Stops the ingestion of live events on an event data store specified as either // an ARN or the ID portion of the ARN. To stop ingestion, the event data store @@ -279,10 +286,10 @@ type CloudTrail interface { // TerminationProtection is enabled. For event data stores for CloudTrail events, // AdvancedEventSelectors includes or excludes management and data events in your // event data store. For more information about AdvancedEventSelectors , see - // PutEventSelectorsRequest$AdvancedEventSelectors . For event data stores for - // Config configuration items, Audit Manager evidence, or non-Amazon Web Services - // events, AdvancedEventSelectors includes events of that type in your event data - // store. + // AdvancedEventSelectors (https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_AdvancedEventSelector.html) + // . For event data stores for Config configuration items, Audit Manager evidence, + // or non-Amazon Web Services events, AdvancedEventSelectors includes events of + // that type in your event data store. UpdateEventDataStore(ctx context.Context, params *UpdateEventDataStoreInput, optFns ...func(*Options)) (*UpdateEventDataStoreOutput, error) // Updates trail settings that control what events you are logging, and how to // handle log files. Changes to a trail do not require stopping the CloudTrail diff --git a/pkg/awsapi/cloudwatchlogs.go b/pkg/awsapi/cloudwatchlogs.go index a1653bce61..1a463290c0 100644 --- a/pkg/awsapi/cloudwatchlogs.go +++ b/pkg/awsapi/cloudwatchlogs.go @@ -10,15 +10,38 @@ import ( // CloudWatchLogs provides an interface to the AWS CloudWatchLogs service. type CloudWatchLogs interface { - // Associates the specified KMS key with the specified log group. Associating a - // KMS key with a log group overrides any existing associations between the log - // group and a KMS key. After a KMS key is associated with a log group, all newly - // ingested data for the log group is encrypted using the KMS key. This association - // is stored as long as the data encrypted with the KMS keyis still within - // CloudWatch Logs. This enables CloudWatch Logs to decrypt this data whenever it - // is requested. CloudWatch Logs supports only symmetric KMS keys. Do not use an - // associate an asymmetric KMS key with your log group. For more information, see - // Using Symmetric and Asymmetric Keys (https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html) + // Associates the specified KMS key with either one log group in the account, or + // with all stored CloudWatch Logs query insights results in the account. When you + // use AssociateKmsKey , you specify either the logGroupName parameter or the + // resourceIdentifier parameter. You can't specify both of those parameters in the + // same operation. + // - Specify the logGroupName parameter to cause all log events stored in the log + // group to be encrypted with that key. Only the log events ingested after the key + // is associated are encrypted with that key. Associating a KMS key with a log + // group overrides any existing associations between the log group and a KMS key. + // After a KMS key is associated with a log group, all newly ingested data for the + // log group is encrypted using the KMS key. This association is stored as long as + // the data encrypted with the KMS key is still within CloudWatch Logs. This + // enables CloudWatch Logs to decrypt this data whenever it is requested. + // Associating a key with a log group does not cause the results of queries of that + // log group to be encrypted with that key. To have query results encrypted with a + // KMS key, you must use an AssociateKmsKey operation with the resourceIdentifier + // parameter that specifies a query-result resource. + // - Specify the resourceIdentifier parameter with a query-result resource, to + // use that key to encrypt the stored results of all future StartQuery (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_StartQuery.html) + // operations in the account. The response from a GetQueryResults (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetQueryResults.html) + // operation will still return the query results in plain text. Even if you have + // not associated a key with your query results, the query results are encrypted + // when stored, using the default CloudWatch Logs method. If you run a query from a + // monitoring account that queries logs in a source account, the query results key + // from the monitoring account, if any, is used. + // + // If you delete the key that is used to encrypt log events or log group query + // results, then all the associated stored log events or query results that were + // encrypted with that key will be unencryptable and unusable. CloudWatch Logs + // supports only symmetric KMS keys. Do not use an associate an asymmetric KMS key + // with your log group or query results. For more information, see Using Symmetric + // and Asymmetric Keys (https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html) // . It can take up to 5 minutes for this operation to take effect. If you attempt // to associate a KMS key with a log group but the KMS key does not exist or the // KMS key is disabled, you receive an InvalidParameterException error. @@ -45,9 +68,9 @@ type CloudWatchLogs interface { // on chunks of log data inside an exported file is not guaranteed. You can sort // the exported log field data by using Linux utilities. CreateExportTask(ctx context.Context, params *CreateExportTaskInput, optFns ...func(*Options)) (*CreateExportTaskOutput, error) - // Creates a log group with the specified name. You can create up to 20,000 log - // groups per account. You must use the following guidelines when naming a log - // group: + // Creates a log group with the specified name. You can create up to 1,000,000 log + // groups per Region per account. You must use the following guidelines when naming + // a log group: // - Log group names must be unique within a Region for an Amazon Web Services // account. // - Log group names can be between 1 and 512 characters long. @@ -62,10 +85,10 @@ type CloudWatchLogs interface { // using the KMS key. This association is stored as long as the data encrypted with // the KMS key is still within CloudWatch Logs. This enables CloudWatch Logs to // decrypt this data whenever it is requested. If you attempt to associate a KMS - // key with the log group but the KMS keydoes not exist or the KMS key is disabled, - // you receive an InvalidParameterException error. CloudWatch Logs supports only - // symmetric KMS keys. Do not associate an asymmetric KMS key with your log group. - // For more information, see Using Symmetric and Asymmetric Keys (https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html) + // key with the log group but the KMS key does not exist or the KMS key is + // disabled, you receive an InvalidParameterException error. CloudWatch Logs + // supports only symmetric KMS keys. Do not associate an asymmetric KMS key with + // your log group. For more information, see Using Symmetric and Asymmetric Keys (https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html) // . CreateLogGroup(ctx context.Context, params *CreateLogGroupInput, optFns ...func(*Options)) (*CreateLogGroupOutput, error) // Creates a log stream for the specified log group. A log stream is a sequence of @@ -78,6 +101,10 @@ type CloudWatchLogs interface { // - Log stream names can be between 1 and 512 characters long. // - Don't use ':' (colon) or '*' (asterisk) characters. CreateLogStream(ctx context.Context, params *CreateLogStreamInput, optFns ...func(*Options)) (*CreateLogStreamOutput, error) + // Deletes a CloudWatch Logs account policy. To use this operation, you must be + // signed on with the logs:DeleteDataProtectionPolicy and logs:DeleteAccountPolicy + // permissions. + DeleteAccountPolicy(ctx context.Context, params *DeleteAccountPolicyInput, optFns ...func(*Options)) (*DeleteAccountPolicyOutput, error) // Deletes the data protection policy from the specified log group. For more // information about data protection policies, see PutDataProtectionPolicy (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDataProtectionPolicy.html) // . @@ -107,6 +134,8 @@ type CloudWatchLogs interface { DeleteRetentionPolicy(ctx context.Context, params *DeleteRetentionPolicyInput, optFns ...func(*Options)) (*DeleteRetentionPolicyOutput, error) // Deletes the specified subscription filter. DeleteSubscriptionFilter(ctx context.Context, params *DeleteSubscriptionFilterInput, optFns ...func(*Options)) (*DeleteSubscriptionFilterOutput, error) + // Returns a list of all CloudWatch Logs account policies in the account. + DescribeAccountPolicies(ctx context.Context, params *DescribeAccountPoliciesInput, optFns ...func(*Options)) (*DescribeAccountPoliciesOutput, error) // Lists all your destinations. The results are ASCII-sorted by destination name. DescribeDestinations(ctx context.Context, params *DescribeDestinationsInput, optFns ...func(*Options)) (*DescribeDestinationsOutput, error) // Lists the specified export tasks. You can list all your export tasks or filter @@ -154,16 +183,30 @@ type CloudWatchLogs interface { // the subscription filters or filter the results by prefix. The results are // ASCII-sorted by filter name. DescribeSubscriptionFilters(ctx context.Context, params *DescribeSubscriptionFiltersInput, optFns ...func(*Options)) (*DescribeSubscriptionFiltersOutput, error) - // Disassociates the associated KMS key from the specified log group. After the - // KMS key is disassociated from the log group, CloudWatch Logs stops encrypting - // newly ingested data for the log group. All previously ingested data remains - // encrypted, and CloudWatch Logs requires permissions for the KMS key whenever the - // encrypted data is requested. Note that it can take up to 5 minutes for this - // operation to take effect. + // Disassociates the specified KMS key from the specified log group or from all + // CloudWatch Logs Insights query results in the account. When you use + // DisassociateKmsKey , you specify either the logGroupName parameter or the + // resourceIdentifier parameter. You can't specify both of those parameters in the + // same operation. + // - Specify the logGroupName parameter to stop using the KMS key to encrypt + // future log events ingested and stored in the log group. Instead, they will be + // encrypted with the default CloudWatch Logs method. The log events that were + // ingested while the key was associated with the log group are still encrypted + // with that key. Therefore, CloudWatch Logs will need permissions for the key + // whenever that data is accessed. + // - Specify the resourceIdentifier parameter with the query-result resource to + // stop using the KMS key to encrypt the results of all future StartQuery (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_StartQuery.html) + // operations in the account. They will instead be encrypted with the default + // CloudWatch Logs method. The results from queries that ran while the key was + // associated with the account are still encrypted with that key. Therefore, + // CloudWatch Logs will need permissions for the key whenever that data is + // accessed. + // + // It can take up to 5 minutes for this operation to take effect. DisassociateKmsKey(ctx context.Context, params *DisassociateKmsKeyInput, optFns ...func(*Options)) (*DisassociateKmsKeyOutput, error) // Lists log events from the specified log group. You can list all the log events // or filter the results using a filter pattern, a time range, and the name of the - // log stream. You must have the logs;FilterLogEvents permission to perform this + // log stream. You must have the logs:FilterLogEvents permission to perform this // operation. You can specify the log group to search by using either // logGroupIdentifier or logGroupName . You must include one of these two // parameters, but you can't include both. By default, this operation returns as @@ -237,6 +280,35 @@ type CloudWatchLogs interface { // // Deprecated: Please use the generic tagging API ListTagsForResource ListTagsLogGroup(ctx context.Context, params *ListTagsLogGroupInput, optFns ...func(*Options)) (*ListTagsLogGroupOutput, error) + // Creates an account-level data protection policy that applies to all log groups + // in the account. A data protection policy can help safeguard sensitive data + // that's ingested by your log groups by auditing and masking the sensitive log + // data. Each account can have only one account-level policy. Sensitive data is + // detected and masked when it is ingested into a log group. When you set a data + // protection policy, log events ingested into the log groups before that time are + // not masked. If you use PutAccountPolicy to create a data protection policy for + // your whole account, it applies to both existing log groups and all log groups + // that are created later in this account. The account policy is applied to + // existing log groups with eventual consistency. It might take up to 5 minutes + // before sensitive data in existing log groups begins to be masked. By default, + // when a user views a log event that includes masked data, the sensitive data is + // replaced by asterisks. A user who has the logs:Unmask permission can use a + // GetLogEvents (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogEvents.html) + // or FilterLogEvents (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_FilterLogEvents.html) + // operation with the unmask parameter set to true to view the unmasked log + // events. Users with the logs:Unmask can also view unmasked data in the + // CloudWatch Logs console by running a CloudWatch Logs Insights query with the + // unmask query command. For more information, including a list of types of data + // that can be audited and masked, see Protect sensitive log data with masking (https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html) + // . To use the PutAccountPolicy operation, you must be signed on with the + // logs:PutDataProtectionPolicy and logs:PutAccountPolicy permissions. The + // PutAccountPolicy operation applies to all log groups in the account. You can + // also use PutDataProtectionPolicy (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDataProtectionPolicy.html) + // to create a data protection policy that applies to just one log group. If a log + // group has its own data protection policy and the account also has an + // account-level data protection policy, then the two policies are cumulative. Any + // sensitive term specified in either policy is masked. + PutAccountPolicy(ctx context.Context, params *PutAccountPolicyInput, optFns ...func(*Options)) (*PutAccountPolicyOutput, error) // Creates a data protection policy for the specified log group. A data protection // policy can help safeguard sensitive data that's ingested by the log group by // auditing and masking the sensitive log data. Sensitive data is detected and @@ -251,7 +323,13 @@ type CloudWatchLogs interface { // CloudWatch Logs console by running a CloudWatch Logs Insights query with the // unmask query command. For more information, including a list of types of data // that can be audited and masked, see Protect sensitive log data with masking (https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html) - // . + // . The PutDataProtectionPolicy operation applies to only the specified log + // group. You can also use PutAccountPolicy (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutAccountPolicy.html) + // to create an account-level data protection policy that applies to all log groups + // in the account, including both existing log groups and log groups that are + // created level. If a log group has its own data protection policy and the account + // also has an account-level data protection policy, then the two policies are + // cumulative. Any sensitive term specified in either policy is masked. PutDataProtectionPolicy(ctx context.Context, params *PutDataProtectionPolicyInput, optFns ...func(*Options)) (*PutDataProtectionPolicyOutput, error) // Creates or updates a destination. This operation is used only to create // destinations for cross-account subscriptions. A destination encapsulates a @@ -291,6 +369,7 @@ type CloudWatchLogs interface { // 2017-09-15T13:45:30 .) // - A batch of log events in a single request cannot span more than 24 hours. // Otherwise, the operation fails. + // - Each log event can be no larger than 256 KB. // - The maximum number of log events in a batch is 10,000. // - The quota of five requests per second per log stream has been removed. // Instead, PutLogEvents actions are throttled based on a per-second per-account @@ -309,12 +388,11 @@ type CloudWatchLogs interface { // are charged as custom metrics. To prevent unexpected high charges, do not // specify high-cardinality fields such as IPAddress or requestID as dimensions. // Each different value found for a dimension is treated as a separate metric and - // accrues charges as a separate custom metric. CloudWatch Logs disables a metric - // filter if it generates 1,000 different name/value pairs for your specified - // dimensions within a certain amount of time. This helps to prevent accidental - // high charges. You can also set up a billing alarm to alert you if your charges - // are higher than expected. For more information, see Creating a Billing Alarm to - // Monitor Your Estimated Amazon Web Services Charges (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/monitor_estimated_charges_with_cloudwatch.html) + // accrues charges as a separate custom metric. CloudWatch Logs might disable a + // metric filter if it generates 1,000 different name/value pairs for your + // specified dimensions within one hour. You can also set up a billing alarm to + // alert you if your charges are higher than expected. For more information, see + // Creating a Billing Alarm to Monitor Your Estimated Amazon Web Services Charges (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/monitor_estimated_charges_with_cloudwatch.html) // . PutMetricFilter(ctx context.Context, params *PutMetricFilterInput, optFns ...func(*Options)) (*PutMetricFilterOutput, error) // Creates or updates a query definition for CloudWatch Logs Insights. For more @@ -343,7 +421,12 @@ type CloudWatchLogs interface { // date is reached. To make sure that log data is deleted permanently, keep a log // group at its lower retention setting until 72 hours after the previous retention // period ends. Alternatively, wait to change the retention setting until you - // confirm that the earlier log events are deleted. + // confirm that the earlier log events are deleted. When log events reach their + // retention setting they are marked for deletion. After they are marked for + // deletion, they do not add to your archival storage costs anymore, even if they + // are not actually deleted until later. These log events marked for deletion are + // also not included when you use an API to retrieve the storedBytes value to see + // how many bytes a log group is storing. PutRetentionPolicy(ctx context.Context, params *PutRetentionPolicyInput, optFns ...func(*Options)) (*PutRetentionPolicyOutput, error) // Creates or updates a subscription filter and associates it with the specified // log group. With subscription filters, you can subscribe to a real-time stream of @@ -353,8 +436,9 @@ type CloudWatchLogs interface { // format. The following destinations are supported for subscription filters: // - An Amazon Kinesis data stream belonging to the same account as the // subscription filter, for same-account delivery. - // - A logical destination that belongs to a different account, for - // cross-account delivery. + // - A logical destination created with PutDestination (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDestination.html) + // that belongs to a different account, for cross-account delivery. We currently + // support Kinesis Data Streams and Kinesis Data Firehose as logical destinations. // - An Amazon Kinesis Data Firehose delivery stream that belongs to the same // account as the subscription filter, for same-account delivery. // - An Lambda function that belongs to the same account as the subscription @@ -362,19 +446,27 @@ type CloudWatchLogs interface { // // Each log group can have up to two subscription filters associated with it. If // you are updating an existing filter, you must specify the correct name in - // filterName . To perform a PutSubscriptionFilter operation, you must also have - // the iam:PassRole permission. + // filterName . To perform a PutSubscriptionFilter operation for any destination + // except a Lambda function, you must also have the iam:PassRole permission. PutSubscriptionFilter(ctx context.Context, params *PutSubscriptionFilterInput, optFns ...func(*Options)) (*PutSubscriptionFilterOutput, error) // Schedules a query of a log group using CloudWatch Logs Insights. You specify // the log group and time range to query and the query string to use. For more // information, see CloudWatch Logs Insights Query Syntax (https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_QuerySyntax.html) - // . Queries time out after 15 minutes of runtime. If your queries are timing out, - // reduce the time range being searched or partition your query into a number of - // queries. If you are using CloudWatch cross-account observability, you can use - // this operation in a monitoring account to start a query in a linked source - // account. For more information, see CloudWatch cross-account observability (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html) + // . After you run a query using StartQuery , the query results are stored by + // CloudWatch Logs. You can use GetQueryResults (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetQueryResults.html) + // to retrieve the results of a query, using the queryId that StartQuery returns. + // If you have associated a KMS key with the query results in this account, then + // StartQuery (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_StartQuery.html) + // uses that key to encrypt the results when it stores them. If no key is + // associated with query results, the query results are encrypted with the default + // CloudWatch Logs encryption method. Queries time out after 60 minutes of runtime. + // If your queries are timing out, reduce the time range being searched or + // partition your query into a number of queries. If you are using CloudWatch + // cross-account observability, you can use this operation in a monitoring account + // to start a query in a linked source account. For more information, see + // CloudWatch cross-account observability (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html) // . For a cross-account StartQuery operation, the query definition must be - // defined in the monitoring account. You can have up to 20 concurrent CloudWatch + // defined in the monitoring account. You can have up to 30 concurrent CloudWatch // Logs insights queries, including queries that have been added to dashboards. StartQuery(ctx context.Context, params *StartQueryInput, optFns ...func(*Options)) (*StartQueryOutput, error) // Stops a CloudWatch Logs Insights query that is in progress. If the query has diff --git a/pkg/awsapi/elasticloadbalancingv2.go b/pkg/awsapi/elasticloadbalancingv2.go index 24a4ccad1a..9e99564aea 100644 --- a/pkg/awsapi/elasticloadbalancingv2.go +++ b/pkg/awsapi/elasticloadbalancingv2.go @@ -80,6 +80,18 @@ type ELBV2 interface { DeleteTargetGroup(ctx context.Context, params *DeleteTargetGroupInput, optFns ...func(*Options)) (*DeleteTargetGroupOutput, error) // Deregisters the specified targets from the specified target group. After the // targets are deregistered, they no longer receive traffic from the load balancer. + // The load balancer stops sending requests to targets that are deregistering, but + // uses connection draining to ensure that in-flight traffic completes on the + // existing connections. This deregistration delay is configured by default but can + // be updated for each target group. For more information, see the following: + // - Deregistration delay (https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-target-groups.html#deregistration-delay) + // in the Application Load Balancers User Guide + // - Deregistration delay (https://docs.aws.amazon.com/elasticloadbalancing/latest/network/load-balancer-target-groups.html#deregistration-delay) + // in the Network Load Balancers User Guide + // - Deregistration delay (https://docs.aws.amazon.com/elasticloadbalancing/latest/gateway/target-groups.html#deregistration-delay) + // in the Gateway Load Balancers User Guide + // + // Note: If the specified target does not exist, the action returns successfully. DeregisterTargets(ctx context.Context, params *DeregisterTargetsInput, optFns ...func(*Options)) (*DeregisterTargetsOutput, error) // Describes the current Elastic Load Balancing resource limits for your Amazon // Web Services account. For more information, see the following: @@ -189,15 +201,18 @@ type ELBV2 interface { // do not specify retain their current priority. SetRulePriorities(ctx context.Context, params *SetRulePrioritiesInput, optFns ...func(*Options)) (*SetRulePrioritiesOutput, error) // Associates the specified security groups with the specified Application Load - // Balancer. The specified security groups override the previously associated - // security groups. You can't specify a security group for a Network Load Balancer - // or Gateway Load Balancer. + // Balancer or Network Load Balancer. The specified security groups override the + // previously associated security groups. You can't perform this operation on a + // Network Load Balancer unless you specified a security group for the load + // balancer when you created it. You can't associate a security group with a + // Gateway Load Balancer. SetSecurityGroups(ctx context.Context, params *SetSecurityGroupsInput, optFns ...func(*Options)) (*SetSecurityGroupsOutput, error) // Enables the Availability Zones for the specified public subnets for the - // specified Application Load Balancer or Network Load Balancer. The specified - // subnets replace the previously enabled subnets. When you specify subnets for a - // Network Load Balancer, you must include all subnets that were enabled - // previously, with their existing configurations, plus any additional subnets. + // specified Application Load Balancer, Network Load Balancer or Gateway Load + // Balancer. The specified subnets replace the previously enabled subnets. When you + // specify subnets for a Network Load Balancer, or Gateway Load Balancer you must + // include all subnets that were enabled previously, with their existing + // configurations, plus any additional subnets. SetSubnets(ctx context.Context, params *SetSubnetsInput, optFns ...func(*Options)) (*SetSubnetsOutput, error) } diff --git a/pkg/awsapi/iam.go b/pkg/awsapi/iam.go index 07939d863d..52f8754b93 100644 --- a/pkg/awsapi/iam.go +++ b/pkg/awsapi/iam.go @@ -24,16 +24,18 @@ type IAM interface { // and then associate the instance profile (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AssociateIamInstanceProfile.html) // , or you can stop your instance and then restart it. The caller of this // operation must be granted the PassRole permission on the IAM role by a - // permissions policy. For more information about roles, see Working with roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html) - // . For more information about instance profiles, see About instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html) - // . + // permissions policy. For more information about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html) + // in the IAM User Guide. For more information about instance profiles, see Using + // instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) + // in the IAM User Guide. AddRoleToInstanceProfile(ctx context.Context, params *AddRoleToInstanceProfileInput, optFns ...func(*Options)) (*AddRoleToInstanceProfileOutput, error) // Adds the specified user to the specified group. AddUserToGroup(ctx context.Context, params *AddUserToGroupInput, optFns ...func(*Options)) (*AddUserToGroupOutput, error) // Attaches the specified managed policy to the specified IAM group. You use this // operation to attach a managed policy to a group. To embed an inline policy in a - // group, use PutGroupPolicy . As a best practice, you can validate your IAM - // policies. To learn more, see Validating IAM policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_policy-validator.html) + // group, use PutGroupPolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_PutGroupPolicy.html) + // . As a best practice, you can validate your IAM policies. To learn more, see + // Validating IAM policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_policy-validator.html) // in the IAM User Guide. For more information about policies, see Managed // policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. @@ -42,18 +44,20 @@ type IAM interface { // attach a managed policy to a role, the managed policy becomes part of the role's // permission (access) policy. You cannot use a managed policy as the role's trust // policy. The role's trust policy is created at the same time as the role, using - // CreateRole . You can update a role's trust policy using UpdateAssumeRolePolicy . - // Use this operation to attach a managed policy to a role. To embed an inline - // policy in a role, use PutRolePolicy . For more information about policies, see - // Managed policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) + // CreateRole (https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreateRole.html) + // . You can update a role's trust policy using UpdateAssumerolePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_UpdateAssumeRolePolicy.html) + // . Use this operation to attach a managed policy to a role. To embed an inline + // policy in a role, use PutRolePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_PutRolePolicy.html) + // . For more information about policies, see Managed policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. As a best practice, you can validate your IAM policies. // To learn more, see Validating IAM policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_policy-validator.html) // in the IAM User Guide. AttachRolePolicy(ctx context.Context, params *AttachRolePolicyInput, optFns ...func(*Options)) (*AttachRolePolicyOutput, error) // Attaches the specified managed policy to the specified user. You use this // operation to attach a managed policy to a user. To embed an inline policy in a - // user, use PutUserPolicy . As a best practice, you can validate your IAM - // policies. To learn more, see Validating IAM policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_policy-validator.html) + // user, use PutUserPolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_PutUserPolicy.html) + // . As a best practice, you can validate your IAM policies. To learn more, see + // Validating IAM policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_policy-validator.html) // in the IAM User Guide. For more information about policies, see Managed // policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. @@ -127,14 +131,14 @@ type IAM interface { // // You get all of this information from the OIDC IdP you want to use to access // Amazon Web Services. Amazon Web Services secures communication with some OIDC - // identity providers (IdPs) through our library of trusted certificate authorities - // (CAs) instead of using a certificate thumbprint to verify your IdP server - // certificate. These OIDC IdPs include Google, Auth0, and those that use an Amazon - // S3 bucket to host a JSON Web Key Set (JWKS) endpoint. In these cases, your - // legacy thumbprint remains in your configuration, but is no longer used for - // validation. The trust for the OIDC provider is derived from the IAM provider - // that this operation creates. Therefore, it is best to limit access to the - // CreateOpenIDConnectProvider operation to highly privileged users. + // identity providers (IdPs) through our library of trusted root certificate + // authorities (CAs) instead of using a certificate thumbprint to verify your IdP + // server certificate. These OIDC IdPs include Auth0, GitHub, Google, and those + // that use an Amazon S3 bucket to host a JSON Web Key Set (JWKS) endpoint. In + // these cases, your legacy thumbprint remains in your configuration, but is no + // longer used for validation. The trust for the OIDC provider is derived from the + // IAM provider that this operation creates. Therefore, it is best to limit access + // to the CreateOpenIDConnectProvider operation to highly privileged users. CreateOpenIDConnectProvider(ctx context.Context, params *CreateOpenIDConnectProviderInput, optFns ...func(*Options)) (*CreateOpenIDConnectProviderOutput, error) // Creates a new managed policy for your Amazon Web Services account. This // operation creates a policy version with a version identifier of v1 and sets v1 @@ -157,9 +161,9 @@ type IAM interface { // in the IAM User Guide. CreatePolicyVersion(ctx context.Context, params *CreatePolicyVersionInput, optFns ...func(*Options)) (*CreatePolicyVersionOutput, error) // Creates a new role for your Amazon Web Services account. For more information - // about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html) - // . For information about quotas for role names and the number of roles you can - // create, see IAM and STS quotas (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) + // about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html) + // in the IAM User Guide. For information about quotas for role names and the + // number of roles you can create, see IAM and STS quotas (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) // in the IAM User Guide. CreateRole(ctx context.Context, params *CreateRoleInput, optFns ...func(*Options)) (*CreateRoleOutput, error) // Creates an IAM resource that describes an identity provider (IdP) that supports @@ -252,8 +256,8 @@ type IAM interface { // with the instance profile you are about to delete. Deleting a role or instance // profile that is associated with a running instance will break any applications // running on the instance. For more information about instance profiles, see - // About instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html) - // . + // Using instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) + // in the IAM User Guide. DeleteInstanceProfile(ctx context.Context, params *DeleteInstanceProfileInput, optFns ...func(*Options)) (*DeleteInstanceProfileOutput, error) // Deletes the password for the specified IAM user, For more information, see // Managing passwords for IAM users (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_passwords_admin-change-user.html) @@ -645,7 +649,7 @@ type IAM interface { GetGroupPolicy(ctx context.Context, params *GetGroupPolicyInput, optFns ...func(*Options)) (*GetGroupPolicyOutput, error) // Retrieves information about the specified instance profile, including the // instance profile's path, GUID, ARN, and role. For more information about - // instance profiles, see About instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html) + // instance profiles, see Using instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) // in the IAM User Guide. GetInstanceProfile(ctx context.Context, params *GetInstanceProfileInput, optFns ...func(*Options)) (*GetInstanceProfileOutput, error) // Retrieves the user name for the specified IAM user. A login profile is created @@ -659,6 +663,8 @@ type IAM interface { // A user with programmatic access does not have a login profile unless you create // a password for the user to access the Amazon Web Services Management Console. GetLoginProfile(ctx context.Context, params *GetLoginProfileInput, optFns ...func(*Options)) (*GetLoginProfileOutput, error) + // Retrieves information about an MFA device for a specified user. + GetMFADevice(ctx context.Context, params *GetMFADeviceInput, optFns ...func(*Options)) (*GetMFADeviceOutput, error) // Returns information about the specified OpenID Connect (OIDC) provider resource // object in IAM. GetOpenIDConnectProvider(ctx context.Context, params *GetOpenIDConnectProviderInput, optFns ...func(*Options)) (*GetOpenIDConnectProviderOutput, error) @@ -708,12 +714,13 @@ type IAM interface { GetPolicyVersion(ctx context.Context, params *GetPolicyVersionInput, optFns ...func(*Options)) (*GetPolicyVersionOutput, error) // Retrieves information about the specified role, including the role's path, // GUID, ARN, and the role's trust policy that grants permission to assume the - // role. For more information about roles, see Working with roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html) - // . Policies returned by this operation are URL-encoded compliant with RFC 3986 (https://tools.ietf.org/html/rfc3986) - // . You can use a URL decoding method to convert the policy back to plain JSON - // text. For example, if you use Java, you can use the decode method of the - // java.net.URLDecoder utility class in the Java SDK. Other languages and SDKs - // provide similar functionality. + // role. For more information about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html) + // in the IAM User Guide. Policies returned by this operation are URL-encoded + // compliant with RFC 3986 (https://tools.ietf.org/html/rfc3986) . You can use a + // URL decoding method to convert the policy back to plain JSON text. For example, + // if you use Java, you can use the decode method of the java.net.URLDecoder + // utility class in the Java SDK. Other languages and SDKs provide similar + // functionality. GetRole(ctx context.Context, params *GetRoleInput, optFns ...func(*Options)) (*GetRoleOutput, error) // Retrieves the specified inline policy document that is embedded with the // specified IAM role. Policies returned by this operation are URL-encoded @@ -726,9 +733,8 @@ type IAM interface { // determine the policy's default version, then use GetPolicyVersion to retrieve // the policy document. For more information about policies, see Managed policies // and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) - // in the IAM User Guide. For more information about roles, see Using roles to - // delegate permissions and federate identities (https://docs.aws.amazon.com/IAM/latest/UserGuide/roles-toplevel.html) - // . + // in the IAM User Guide. For more information about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html) + // in the IAM User Guide. GetRolePolicy(ctx context.Context, params *GetRolePolicyInput, optFns ...func(*Options)) (*GetRolePolicyOutput, error) // Returns the SAML provider metadocument that was uploaded when the IAM SAML // provider resource object was created or updated. This operation requires @@ -902,17 +908,18 @@ type IAM interface { ListInstanceProfileTags(ctx context.Context, params *ListInstanceProfileTagsInput, optFns ...func(*Options)) (*ListInstanceProfileTagsOutput, error) // Lists the instance profiles that have the specified path prefix. If there are // none, the operation returns an empty list. For more information about instance - // profiles, see About instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html) - // . IAM resource-listing operations return a subset of the available attributes - // for the resource. For example, this operation does not return tags, even though - // they are an attribute of the returned object. To view all of the information for - // an instance profile, see GetInstanceProfile . You can paginate the results using - // the MaxItems and Marker parameters. + // profiles, see Using instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) + // in the IAM User Guide. IAM resource-listing operations return a subset of the + // available attributes for the resource. For example, this operation does not + // return tags, even though they are an attribute of the returned object. To view + // all of the information for an instance profile, see GetInstanceProfile . You can + // paginate the results using the MaxItems and Marker parameters. ListInstanceProfiles(ctx context.Context, params *ListInstanceProfilesInput, optFns ...func(*Options)) (*ListInstanceProfilesOutput, error) // Lists the instance profiles that have the specified associated IAM role. If // there are none, the operation returns an empty list. For more information about - // instance profiles, go to About instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html) - // . You can paginate the results using the MaxItems and Marker parameters. + // instance profiles, go to Using instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) + // in the IAM User Guide. You can paginate the results using the MaxItems and + // Marker parameters. ListInstanceProfilesForRole(ctx context.Context, params *ListInstanceProfilesForRoleInput, optFns ...func(*Options)) (*ListInstanceProfilesForRoleOutput, error) // Lists the tags that are attached to the specified IAM virtual multi-factor // authentication (MFA) device. The returned list of tags is sorted by tag key. For @@ -1004,13 +1011,16 @@ type IAM interface { // IAM User Guide. ListRoleTags(ctx context.Context, params *ListRoleTagsInput, optFns ...func(*Options)) (*ListRoleTagsOutput, error) // Lists the IAM roles that have the specified path prefix. If there are none, the - // operation returns an empty list. For more information about roles, see Working - // with roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html) - // . IAM resource-listing operations return a subset of the available attributes - // for the resource. For example, this operation does not return tags, even though - // they are an attribute of the returned object. To view all of the information for - // a role, see GetRole . You can paginate the results using the MaxItems and Marker - // parameters. + // operation returns an empty list. For more information about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html) + // in the IAM User Guide. IAM resource-listing operations return a subset of the + // available attributes for the resource. This operation does not return the + // following attributes, even though they are an attribute of the returned object: + // - PermissionsBoundary + // - RoleLastUsed + // - Tags + // + // To view all of the information for a role, see GetRole . You can paginate the + // results using the MaxItems and Marker parameters. ListRoles(ctx context.Context, params *ListRolesInput, optFns ...func(*Options)) (*ListRolesOutput, error) // Lists the tags that are attached to the specified Security Assertion Markup // Language (SAML) identity provider. The returned list of tags is sorted by tag @@ -1089,10 +1099,14 @@ type IAM interface { // Lists the IAM users that have the specified path prefix. If no path prefix is // specified, the operation returns all users in the Amazon Web Services account. // If there are none, the operation returns an empty list. IAM resource-listing - // operations return a subset of the available attributes for the resource. For - // example, this operation does not return tags, even though they are an attribute - // of the returned object. To view all of the information for a user, see GetUser . - // You can paginate the results using the MaxItems and Marker parameters. + // operations return a subset of the available attributes for the resource. This + // operation does not return the following attributes, even though they are an + // attribute of the returned object: + // - PermissionsBoundary + // - Tags + // + // To view all of the information for a user, see GetUser . You can paginate the + // results using the MaxItems and Marker parameters. ListUsers(ctx context.Context, params *ListUsersInput, optFns ...func(*Options)) (*ListUsersOutput, error) // Lists the virtual MFA devices defined in the Amazon Web Services account by // assignment status. If you do not specify an assignment status, the operation @@ -1105,9 +1119,9 @@ type IAM interface { ListVirtualMFADevices(ctx context.Context, params *ListVirtualMFADevicesInput, optFns ...func(*Options)) (*ListVirtualMFADevicesOutput, error) // Adds or updates an inline policy document that is embedded in the specified IAM // group. A user can also have managed policies attached to it. To attach a managed - // policy to a group, use AttachGroupPolicy . To create a new managed policy, use - // CreatePolicy . For information about policies, see Managed policies and inline - // policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) + // policy to a group, use AttachGroupPolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachGroupPolicy.html) + // . To create a new managed policy, use CreatePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreatePolicy.html) + // . For information about policies, see Managed policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. For information about the maximum number of inline // policies that you can embed in a group, see IAM and STS quotas (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) // in the IAM User Guide. Because policy documents can be large, you should use @@ -1129,13 +1143,13 @@ type IAM interface { // Adds or updates an inline policy document that is embedded in the specified IAM // role. When you embed an inline policy in a role, the inline policy is used as // part of the role's access (permissions) policy. The role's trust policy is - // created at the same time as the role, using CreateRole . You can update a role's - // trust policy using UpdateAssumeRolePolicy . For more information about IAM - // roles, see Using roles to delegate permissions and federate identities (https://docs.aws.amazon.com/IAM/latest/UserGuide/roles-toplevel.html) - // . A role can also have a managed policy attached to it. To attach a managed - // policy to a role, use AttachRolePolicy . To create a new managed policy, use - // CreatePolicy . For information about policies, see Managed policies and inline - // policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) + // created at the same time as the role, using CreateRole (https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreateRole.html) + // . You can update a role's trust policy using UpdateAssumeRolePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_UpdateAssumeRolePolicy.html) + // . For more information about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/roles-toplevel.html) + // in the IAM User Guide. A role can also have a managed policy attached to it. To + // attach a managed policy to a role, use AttachRolePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachRolePolicy.html) + // . To create a new managed policy, use CreatePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreatePolicy.html) + // . For information about policies, see Managed policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. For information about the maximum number of inline // policies that you can embed with a role, see IAM and STS quotas (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) // in the IAM User Guide. Because policy documents can be large, you should use @@ -1155,9 +1169,9 @@ type IAM interface { PutUserPermissionsBoundary(ctx context.Context, params *PutUserPermissionsBoundaryInput, optFns ...func(*Options)) (*PutUserPermissionsBoundaryOutput, error) // Adds or updates an inline policy document that is embedded in the specified IAM // user. An IAM user can also have a managed policy attached to it. To attach a - // managed policy to a user, use AttachUserPolicy . To create a new managed policy, - // use CreatePolicy . For information about policies, see Managed policies and - // inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) + // managed policy to a user, use AttachUserPolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachUserPolicy.html) + // . To create a new managed policy, use CreatePolicy (https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreatePolicy.html) + // . For information about policies, see Managed policies and inline policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. For information about the maximum number of inline // policies that you can embed in a user, see IAM and STS quotas (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) // in the IAM User Guide. Because policy documents can be large, you should use @@ -1174,10 +1188,10 @@ type IAM interface { // sure that you do not have any Amazon EC2 instances running with the role you are // about to remove from the instance profile. Removing a role from an instance // profile that is associated with a running instance might break any applications - // running on the instance. For more information about IAM roles, see Working with - // roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html) . - // For more information about instance profiles, see About instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html) - // . + // running on the instance. For more information about roles, see IAM roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html) + // in the IAM User Guide. For more information about instance profiles, see Using + // instance profiles (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) + // in the IAM User Guide. RemoveRoleFromInstanceProfile(ctx context.Context, params *RemoveRoleFromInstanceProfileInput, optFns ...func(*Options)) (*RemoveRoleFromInstanceProfileOutput, error) // Removes the specified user from the specified group. RemoveUserFromGroup(ctx context.Context, params *RemoveUserFromGroupInput, optFns ...func(*Options)) (*RemoveUserFromGroupOutput, error) @@ -1587,15 +1601,15 @@ type IAM interface { // rarely. However, if the provider's certificate does change, any attempt to // assume an IAM role that specifies the OIDC provider as a principal fails until // the certificate thumbprint is updated. Amazon Web Services secures communication - // with some OIDC identity providers (IdPs) through our library of trusted + // with some OIDC identity providers (IdPs) through our library of trusted root // certificate authorities (CAs) instead of using a certificate thumbprint to - // verify your IdP server certificate. These OIDC IdPs include Google, Auth0, and - // those that use an Amazon S3 bucket to host a JSON Web Key Set (JWKS) endpoint. - // In these cases, your legacy thumbprint remains in your configuration, but is no - // longer used for validation. Trust for the OIDC provider is derived from the - // provider certificate and is validated by the thumbprint. Therefore, it is best - // to limit access to the UpdateOpenIDConnectProviderThumbprint operation to - // highly privileged users. + // verify your IdP server certificate. These OIDC IdPs include Auth0, GitHub, + // Google, and those that use an Amazon S3 bucket to host a JSON Web Key Set (JWKS) + // endpoint. In these cases, your legacy thumbprint remains in your configuration, + // but is no longer used for validation. Trust for the OIDC provider is derived + // from the provider certificate and is validated by the thumbprint. Therefore, it + // is best to limit access to the UpdateOpenIDConnectProviderThumbprint operation + // to highly privileged users. UpdateOpenIDConnectProviderThumbprint(ctx context.Context, params *UpdateOpenIDConnectProviderThumbprintInput, optFns ...func(*Options)) (*UpdateOpenIDConnectProviderThumbprintOutput, error) // Updates the description or maximum session duration setting of a role. UpdateRole(ctx context.Context, params *UpdateRoleInput, optFns ...func(*Options)) (*UpdateRoleOutput, error) diff --git a/pkg/awsapi/ssm.go b/pkg/awsapi/ssm.go index 759a37537b..953dcb2e91 100644 --- a/pkg/awsapi/ssm.go +++ b/pkg/awsapi/ssm.go @@ -96,8 +96,8 @@ type SSM interface { // 5 PM. CreateMaintenanceWindow(ctx context.Context, params *CreateMaintenanceWindowInput, optFns ...func(*Options)) (*CreateMaintenanceWindowOutput, error) // Creates a new OpsItem. You must have permission in Identity and Access - // Management (IAM) to create a new OpsItem. For more information, see Getting - // started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) + // Management (IAM) to create a new OpsItem. For more information, see Set up + // OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-setup.html) // in the Amazon Web Services Systems Manager User Guide. Operations engineers and // IT professionals use Amazon Web Services Systems Manager OpsCenter to view, // investigate, and remediate operational issues impacting the performance and @@ -225,15 +225,16 @@ type SSM interface { DescribeEffectivePatchesForPatchBaseline(ctx context.Context, params *DescribeEffectivePatchesForPatchBaselineInput, optFns ...func(*Options)) (*DescribeEffectivePatchesForPatchBaselineOutput, error) // The status of the associations for the managed node(s). DescribeInstanceAssociationsStatus(ctx context.Context, params *DescribeInstanceAssociationsStatusInput, optFns ...func(*Options)) (*DescribeInstanceAssociationsStatusOutput, error) - // Describes one or more of your managed nodes, including information about the - // operating system platform, the version of SSM Agent installed on the managed - // node, node status, and so on. If you specify one or more managed node IDs, it + // Provides information about one or more of your managed nodes, including the + // operating system platform, SSM Agent version, association status, and IP + // address. This operation does not return information for nodes that are either + // Stopped or Terminated. If you specify one or more node IDs, the operation // returns information for those managed nodes. If you don't specify node IDs, it // returns information for all your managed nodes. If you specify a node ID that // isn't valid or a node that you don't own, you receive an error. The IamRole - // field for this API operation is the Identity and Access Management (IAM) role - // assigned to on-premises managed nodes. This call doesn't return the IAM role for - // EC2 instances. + // field returned for this API operation is the Identity and Access Management + // (IAM) role assigned to on-premises managed nodes. This operation does not return + // the IAM role for EC2 instances. DescribeInstanceInformation(ctx context.Context, params *DescribeInstanceInformationInput, optFns ...func(*Options)) (*DescribeInstanceInformationOutput, error) // Retrieves the high-level patch state of one or more managed nodes. DescribeInstancePatchStates(ctx context.Context, params *DescribeInstancePatchStatesInput, optFns ...func(*Options)) (*DescribeInstancePatchStatesOutput, error) @@ -270,8 +271,8 @@ type SSM interface { // managed node is associated with. DescribeMaintenanceWindowsForTarget(ctx context.Context, params *DescribeMaintenanceWindowsForTargetInput, optFns ...func(*Options)) (*DescribeMaintenanceWindowsForTargetOutput, error) // Query a set of OpsItems. You must have permission in Identity and Access - // Management (IAM) to query a list of OpsItems. For more information, see Getting - // started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) + // Management (IAM) to query a list of OpsItems. For more information, see Set up + // OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-setup.html) // in the Amazon Web Services Systems Manager User Guide. Operations engineers and // IT professionals use Amazon Web Services Systems Manager OpsCenter to view, // investigate, and remediate operational issues impacting the performance and @@ -386,7 +387,7 @@ type SSM interface { GetMaintenanceWindowTask(ctx context.Context, params *GetMaintenanceWindowTaskInput, optFns ...func(*Options)) (*GetMaintenanceWindowTaskOutput, error) // Get information about an OpsItem by using the ID. You must have permission in // Identity and Access Management (IAM) to view information about an OpsItem. For - // more information, see Getting started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) + // more information, see Set up OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-setup.html) // in the Amazon Web Services Systems Manager User Guide. Operations engineers and // IT professionals use Amazon Web Services Systems Manager OpsCenter to view, // investigate, and remediate operational issues impacting the performance and @@ -730,8 +731,8 @@ type SSM interface { // information, see CreateActivation . UpdateManagedInstanceRole(ctx context.Context, params *UpdateManagedInstanceRoleInput, optFns ...func(*Options)) (*UpdateManagedInstanceRoleOutput, error) // Edit or change an OpsItem. You must have permission in Identity and Access - // Management (IAM) to update an OpsItem. For more information, see Getting - // started with OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html) + // Management (IAM) to update an OpsItem. For more information, see Set up + // OpsCenter (https://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-setup.html) // in the Amazon Web Services Systems Manager User Guide. Operations engineers and // IT professionals use Amazon Web Services Systems Manager OpsCenter to view, // investigate, and remediate operational issues impacting the performance and diff --git a/pkg/az/az.go b/pkg/az/az.go index 3895ba99aa..d2eab86619 100644 --- a/pkg/az/az.go +++ b/pkg/az/az.go @@ -19,7 +19,7 @@ import ( ) var zoneIDsToAvoid = map[string][]string{ - api.RegionCNNorth1: {"cnn1-az4"}, // https://github.com/weaveworks/eksctl/issues/3916 + api.RegionCNNorth1: {"cnn1-az4"}, // https://github.com/eksctl-io/eksctl/issues/3916 } func GetAvailabilityZones(ctx context.Context, ec2API awsapi.EC2, region string, spec *api.ClusterConfig) ([]string, error) { @@ -120,7 +120,8 @@ func FilterBasedOnAvailability(ctx context.Context, zones []string, np []api.Nod } func GetInstanceTypeOfferings(ctx context.Context, ec2API awsapi.EC2, instances []string, zones []string) (map[string]map[string]struct{}, error) { - output, err := ec2API.DescribeInstanceTypeOfferings(ctx, &ec2.DescribeInstanceTypeOfferingsInput{ + var instanceTypeOfferings []ec2types.InstanceTypeOffering + p := ec2.NewDescribeInstanceTypeOfferingsPaginator(ec2API, &ec2.DescribeInstanceTypeOfferingsInput{ Filters: []ec2types.Filter{ { Name: aws.String("instance-type"), @@ -134,14 +135,18 @@ func GetInstanceTypeOfferings(ctx context.Context, ec2API awsapi.EC2, instances LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), }) - if err != nil { - return nil, fmt.Errorf("unable to list offerings for instance types: %w", err) + for p.HasMorePages() { + output, err := p.NextPage(ctx) + if err != nil { + return nil, fmt.Errorf("unable to list offerings for instance types %w", err) + } + instanceTypeOfferings = append(instanceTypeOfferings, output.InstanceTypeOfferings...) } // zoneToInstanceMap['us-west-1b']['t2.small']=struct{}{} // zoneToInstanceMap['us-west-1b']['t2.large']=struct{}{} zoneToInstanceMap := make(map[string]map[string]struct{}) - for _, offer := range output.InstanceTypeOfferings { + for _, offer := range instanceTypeOfferings { if _, ok := zoneToInstanceMap[aws.ToString(offer.Location)]; !ok { zoneToInstanceMap[aws.ToString(offer.Location)] = make(map[string]struct{}) } diff --git a/pkg/az/az_test.go b/pkg/az/az_test.go index e605033000..919be08598 100644 --- a/pkg/az/az_test.go +++ b/pkg/az/az_test.go @@ -201,6 +201,7 @@ var _ = Describe("AZ", func() { createAvailabilityZone(region, ec2types.AvailabilityZoneStateAvailable, "zone4"), }, }, nil) + // split DescribeInstanceTypeOfferings response in two pages so we unit test the use of the paginator at the same time p.MockEC2().On("DescribeInstanceTypeOfferings", mock.Anything, &ec2.DescribeInstanceTypeOfferingsInput{ Filters: []ec2types.Filter{ { @@ -215,6 +216,7 @@ var _ = Describe("AZ", func() { LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + NextToken: aws.String("token"), InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "t2.small", @@ -231,6 +233,24 @@ var _ = Describe("AZ", func() { Location: aws.String("zone4"), LocationType: "availability-zone", }, + }, + }, nil) + p.MockEC2().On("DescribeInstanceTypeOfferings", mock.Anything, &ec2.DescribeInstanceTypeOfferingsInput{ + Filters: []ec2types.Filter{ + { + Name: aws.String("instance-type"), + Values: []string{"t2.small", "t2.medium"}, + }, + { + Name: aws.String("location"), + Values: []string{"zone1", "zone2", "zone3", "zone4"}, + }, + }, + LocationType: ec2types.LocationTypeAvailabilityZone, + MaxResults: aws.Int32(100), + NextToken: aws.String("token"), + }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "t2.medium", Location: aws.String("zone1"), diff --git a/pkg/cfn/builder/cluster.go b/pkg/cfn/builder/cluster.go index ed8d82b5cd..aaf0614639 100644 --- a/pkg/cfn/builder/cluster.go +++ b/pkg/cfn/builder/cluster.go @@ -99,7 +99,7 @@ func (c *ClusterResourceSet) AddAllResources(ctx context.Context) error { return nil }) - c.Template().Mappings[servicePrincipalPartitionMapName] = servicePrincipalPartitionMappings + c.Template().Mappings[servicePrincipalPartitionMapName] = api.Partitions.ServicePrincipalPartitionMappings() c.rs.template.Description = fmt.Sprintf( "%s (dedicated VPC: %v, dedicated IAM: %v) %s", diff --git a/pkg/cfn/builder/fargate.go b/pkg/cfn/builder/fargate.go index 41e37140ca..b621324a30 100644 --- a/pkg/cfn/builder/fargate.go +++ b/pkg/cfn/builder/fargate.go @@ -5,11 +5,12 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" + gfniam "github.com/weaveworks/goformation/v4/cloudformation/iam" + gfnt "github.com/weaveworks/goformation/v4/cloudformation/types" + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/outputs" cft "github.com/weaveworks/eksctl/pkg/cfn/template" - gfniam "github.com/weaveworks/goformation/v4/cloudformation/iam" - gfnt "github.com/weaveworks/goformation/v4/cloudformation/types" ) const ( @@ -36,7 +37,7 @@ func NewFargateResourceSet(spec *api.ClusterConfig) *FargateResourceSet { } func (rs *FargateResourceSet) AddAllResources() error { - rs.rs.template.Mappings[servicePrincipalPartitionMapName] = servicePrincipalPartitionMappings + rs.rs.template.Mappings[servicePrincipalPartitionMapName] = api.Partitions.ServicePrincipalPartitionMappings() rs.rs.template.Description = fmt.Sprintf( "%s %s", diff --git a/pkg/cfn/builder/karpenter.go b/pkg/cfn/builder/karpenter.go index 7ae95a8ce8..42f0dd6048 100644 --- a/pkg/cfn/builder/karpenter.go +++ b/pkg/cfn/builder/karpenter.go @@ -120,7 +120,7 @@ func (k *KarpenterResourceSet) addResourcesForKarpenter() error { iamPolicyAmazonEC2ContainerRegistryReadOnly, iamPolicyAmazonSSMManagedInstanceCore, ) - k.Template().Mappings[servicePrincipalPartitionMapName] = servicePrincipalPartitionMappings + k.Template().Mappings[servicePrincipalPartitionMapName] = api.Partitions.ServicePrincipalPartitionMappings() roleName := gfnt.NewString(fmt.Sprintf("eksctl-%s-%s", KarpenterNodeRoleName, k.clusterSpec.Metadata.Name)) role := gfniam.Role{ RoleName: roleName, diff --git a/pkg/cfn/builder/karpenter_test.go b/pkg/cfn/builder/karpenter_test.go index 0d9bffb5d9..11935ea3a1 100644 --- a/pkg/cfn/builder/karpenter_test.go +++ b/pkg/cfn/builder/karpenter_test.go @@ -82,6 +82,16 @@ var expectedTemplate = `{ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", @@ -209,6 +219,16 @@ var expectedTemplateWithPermissionBoundary = `{ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", @@ -337,6 +357,16 @@ var expectedTemplateWithSpotInterruptionQueue = `{ "EKS": "eks.amazonaws.com", "EKSFargatePods": "eks-fargate-pods.amazonaws.com" }, + "aws-iso": { + "EC2": "ec2.c2s.ic.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, + "aws-iso-b": { + "EC2": "ec2.sc2s.sgov.gov", + "EKS": "eks.amazonaws.com", + "EKSFargatePods": "eks-fargate-pods.amazonaws.com" + }, "aws-us-gov": { "EC2": "ec2.amazonaws.com", "EKS": "eks.amazonaws.com", diff --git a/pkg/cfn/builder/managed_nodegroup.go b/pkg/cfn/builder/managed_nodegroup.go index 4c014d8aef..892668fc47 100644 --- a/pkg/cfn/builder/managed_nodegroup.go +++ b/pkg/cfn/builder/managed_nodegroup.go @@ -61,7 +61,7 @@ func (m *ManagedNodeGroupResourceSet) AddAllResources(ctx context.Context) error api.IsEnabled(m.nodeGroup.SSH.Allow), "[created by eksctl]") - m.template.Mappings[servicePrincipalPartitionMapName] = servicePrincipalPartitionMappings + m.template.Mappings[servicePrincipalPartitionMapName] = api.Partitions.ServicePrincipalPartitionMappings() var nodeRole *gfnt.Value if m.nodeGroup.IAM.InstanceRoleARN == "" { diff --git a/pkg/cfn/builder/nodegroup.go b/pkg/cfn/builder/nodegroup.go index 9b71fea7b2..4c3f2a4dea 100644 --- a/pkg/cfn/builder/nodegroup.go +++ b/pkg/cfn/builder/nodegroup.go @@ -35,6 +35,16 @@ const ( taintsPrefix = nodeTemplatePrefix + "taint/" ) +// NodeGroupOptions represents options passed to a NodeGroupResourceSet. +type NodeGroupOptions struct { + ClusterConfig *api.ClusterConfig + NodeGroup *api.NodeGroup + Bootstrapper nodebootstrap.Bootstrapper + ForceAddCNIPolicy bool + VPCImporter vpc.Importer + SkipEgressRules bool +} + // NodeGroupResourceSet stores the resource information of the nodegroup type NodeGroupResourceSet struct { rs *resourceSet @@ -49,19 +59,21 @@ type NodeGroupResourceSet struct { vpc *gfnt.Value vpcImporter vpc.Importer bootstrapper nodebootstrap.Bootstrapper + skipEgressRules bool } // NewNodeGroupResourceSet returns a resource set for a nodegroup embedded in a cluster config -func NewNodeGroupResourceSet(ec2API awsapi.EC2, iamAPI awsapi.IAM, spec *api.ClusterConfig, ng *api.NodeGroup, bootstrapper nodebootstrap.Bootstrapper, forceAddCNIPolicy bool, vpcImporter vpc.Importer) *NodeGroupResourceSet { +func NewNodeGroupResourceSet(ec2API awsapi.EC2, iamAPI awsapi.IAM, options NodeGroupOptions) *NodeGroupResourceSet { return &NodeGroupResourceSet{ rs: newResourceSet(), - forceAddCNIPolicy: forceAddCNIPolicy, - clusterSpec: spec, - spec: ng, + forceAddCNIPolicy: options.ForceAddCNIPolicy, + clusterSpec: options.ClusterConfig, + spec: options.NodeGroup, ec2API: ec2API, iamAPI: iamAPI, - vpcImporter: vpcImporter, - bootstrapper: bootstrapper, + vpcImporter: options.VPCImporter, + bootstrapper: options.Bootstrapper, + skipEgressRules: options.SkipEgressRules, } } @@ -78,7 +90,7 @@ func (n *NodeGroupResourceSet) AddAllResources(ctx context.Context) error { n.spec.AMIFamily, api.IsEnabled(n.spec.SSH.Allow), n.spec.PrivateNetworking, templateDescriptionSuffix) - n.Template().Mappings[servicePrincipalPartitionMapName] = servicePrincipalPartitionMappings + n.Template().Mappings[servicePrincipalPartitionMapName] = api.Partitions.ServicePrincipalPartitionMappings() n.rs.defineOutputWithoutCollector(outputs.NodeGroupFeaturePrivateNetworking, n.spec.PrivateNetworking, false) n.rs.defineOutputWithoutCollector(outputs.NodeGroupFeatureSharedSecurityGroup, n.spec.SecurityGroups.WithShared, false) @@ -132,6 +144,34 @@ func (n *NodeGroupResourceSet) AddAllResources(ctx context.Context) error { return n.addResourcesForNodeGroup(ctx) } +// A PartialEgressRule represents a partial security group egress rule. +type PartialEgressRule struct { + FromPort int + ToPort int + IPProtocol string +} + +var controlPlaneEgressInterCluster = PartialEgressRule{ + FromPort: 1025, + ToPort: 65535, + IPProtocol: "tcp", +} + +var controlPlaneEgressInterClusterAPI = PartialEgressRule{ + FromPort: 443, + ToPort: 443, + IPProtocol: "tcp", +} + +// ControlPlaneNodeGroupEgressRules is a slice of egress rules attached to the control plane security group. +var ControlPlaneNodeGroupEgressRules = []PartialEgressRule{ + controlPlaneEgressInterCluster, + controlPlaneEgressInterClusterAPI, +} + +// ControlPlaneEgressRuleDescriptionPrefix is the prefix applied to the description for control plane security group egress rules. +var ControlPlaneEgressRuleDescriptionPrefix = "Allow control plane to communicate with " + func (n *NodeGroupResourceSet) addResourcesForSecurityGroups() { for _, id := range n.spec.SecurityGroups.AttachIDs { n.securityGroups = append(n.securityGroups, gfnt.NewString(id)) @@ -166,22 +206,24 @@ func (n *NodeGroupResourceSet) addResourcesForSecurityGroups() { n.securityGroups = append(n.securityGroups, efaSG) } - n.newResource("EgressInterCluster", &gfnec2.SecurityGroupEgress{ - GroupId: refControlPlaneSG, - DestinationSecurityGroupId: refNodeGroupLocalSG, - Description: gfnt.NewString("Allow control plane to communicate with " + desc + " (kubelet and workload TCP ports)"), - IpProtocol: sgProtoTCP, - FromPort: sgMinNodePort, - ToPort: sgMaxNodePort, - }) - n.newResource("EgressInterClusterAPI", &gfnec2.SecurityGroupEgress{ - GroupId: refControlPlaneSG, - DestinationSecurityGroupId: refNodeGroupLocalSG, - Description: gfnt.NewString("Allow control plane to communicate with " + desc + " (workloads using HTTPS port, commonly used with extension API servers)"), - IpProtocol: sgProtoTCP, - FromPort: sgPortHTTPS, - ToPort: sgPortHTTPS, - }) + if !n.skipEgressRules { + n.newResource("EgressInterCluster", &gfnec2.SecurityGroupEgress{ + GroupId: refControlPlaneSG, + DestinationSecurityGroupId: refNodeGroupLocalSG, + Description: gfnt.NewString(ControlPlaneEgressRuleDescriptionPrefix + desc + " (kubelet and workload TCP ports)"), + IpProtocol: gfnt.NewString(controlPlaneEgressInterCluster.IPProtocol), + FromPort: gfnt.NewInteger(controlPlaneEgressInterCluster.FromPort), + ToPort: gfnt.NewInteger(controlPlaneEgressInterCluster.ToPort), + }) + n.newResource("EgressInterClusterAPI", &gfnec2.SecurityGroupEgress{ + GroupId: refControlPlaneSG, + DestinationSecurityGroupId: refNodeGroupLocalSG, + Description: gfnt.NewString(ControlPlaneEgressRuleDescriptionPrefix + desc + " (workloads using HTTPS port, commonly used with extension API servers)"), + IpProtocol: gfnt.NewString(controlPlaneEgressInterClusterAPI.IPProtocol), + FromPort: gfnt.NewInteger(controlPlaneEgressInterClusterAPI.FromPort), + ToPort: gfnt.NewInteger(controlPlaneEgressInterClusterAPI.ToPort), + }) + } n.newResource("IngressInterClusterCP", &gfnec2.SecurityGroupIngress{ GroupId: refControlPlaneSG, SourceSecurityGroupId: refNodeGroupLocalSG, @@ -197,16 +239,16 @@ func makeNodeIngressRules(ng *api.NodeGroupBase, controlPlaneSG *gfnt.Value, vpc { SourceSecurityGroupId: controlPlaneSG, Description: gfnt.NewString(fmt.Sprintf("[IngressInterCluster] Allow %s to communicate with control plane (kubelet and workload TCP ports)", description)), - IpProtocol: sgProtoTCP, - FromPort: sgMinNodePort, - ToPort: sgMaxNodePort, + IpProtocol: gfnt.NewString(controlPlaneEgressInterCluster.IPProtocol), + FromPort: gfnt.NewInteger(controlPlaneEgressInterCluster.FromPort), + ToPort: gfnt.NewInteger(controlPlaneEgressInterCluster.ToPort), }, { SourceSecurityGroupId: controlPlaneSG, Description: gfnt.NewString(fmt.Sprintf("[IngressInterClusterAPI] Allow %s to communicate with control plane (workloads using HTTPS port, commonly used with extension API servers)", description)), - IpProtocol: sgProtoTCP, - FromPort: sgPortHTTPS, - ToPort: sgPortHTTPS, + IpProtocol: gfnt.NewString(controlPlaneEgressInterClusterAPI.IPProtocol), + FromPort: gfnt.NewInteger(controlPlaneEgressInterClusterAPI.FromPort), + ToPort: gfnt.NewInteger(controlPlaneEgressInterClusterAPI.ToPort), }, } diff --git a/pkg/cfn/builder/nodegroup_test.go b/pkg/cfn/builder/nodegroup_test.go index c09965eb1b..d984b96925 100644 --- a/pkg/cfn/builder/nodegroup_test.go +++ b/pkg/cfn/builder/nodegroup_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/weaveworks/eksctl/pkg/testutils/mockprovider" . "github.com/onsi/ginkgo/v2" @@ -35,10 +36,12 @@ var _ = Describe("Unmanaged NodeGroup Template Builder", func() { fakeVPCImporter *vpcfakes.FakeImporter fakeBootstrapper *bootstrapfakes.FakeBootstrapper p = mockprovider.NewMockProvider() + skipEgressRules bool ) BeforeEach(func() { forceAddCNIPolicy = false + skipEgressRules = false fakeVPCImporter = new(vpcfakes.FakeImporter) fakeBootstrapper = new(bootstrapfakes.FakeBootstrapper) cfg, ng = newClusterAndNodeGroup() @@ -51,7 +54,14 @@ var _ = Describe("Unmanaged NodeGroup Template Builder", func() { }) JustBeforeEach(func() { - ngrs = builder.NewNodeGroupResourceSet(p.MockEC2(), p.MockIAM(), cfg, ng, fakeBootstrapper, forceAddCNIPolicy, fakeVPCImporter) + ngrs = builder.NewNodeGroupResourceSet(p.MockEC2(), p.MockIAM(), builder.NodeGroupOptions{ + ClusterConfig: cfg, + NodeGroup: ng, + Bootstrapper: fakeBootstrapper, + ForceAddCNIPolicy: forceAddCNIPolicy, + VPCImporter: fakeVPCImporter, + SkipEgressRules: skipEgressRules, + }) }) Describe("AddAllResources", func() { @@ -1312,6 +1322,24 @@ var _ = Describe("Unmanaged NodeGroup Template Builder", func() { Expect(properties.LaunchTemplateData.Monitoring.Enabled).To(Equal(true)) }) }) + + Context("skipEgressRules is false", func() { + It("should add egress rules", func() { + Expect(ngTemplate.Resources).To(HaveKey("EgressInterCluster")) + Expect(ngTemplate.Resources).To(HaveKey("EgressInterClusterAPI")) + }) + }) + + Context("skipEgressRules is true", func() { + BeforeEach(func() { + skipEgressRules = true + }) + + It("should not add egress rules", func() { + Expect(ngTemplate.Resources).NotTo(HaveKey("EgressInterCluster")) + Expect(ngTemplate.Resources).NotTo(HaveKey("EgressInterClusterAPI")) + }) + }) }) }) diff --git a/pkg/cfn/builder/partition.go b/pkg/cfn/builder/partition.go index 826cf78498..3a650557ea 100644 --- a/pkg/cfn/builder/partition.go +++ b/pkg/cfn/builder/partition.go @@ -6,28 +6,10 @@ import ( gfnt "github.com/weaveworks/goformation/v4/cloudformation/types" ) -var servicePrincipalPartitionMappings = map[string]map[string]string{ - "aws": { - "EC2": "ec2.amazonaws.com", - "EKS": "eks.amazonaws.com", - "EKSFargatePods": "eks-fargate-pods.amazonaws.com", - }, - "aws-us-gov": { - "EC2": "ec2.amazonaws.com", - "EKS": "eks.amazonaws.com", - "EKSFargatePods": "eks-fargate-pods.amazonaws.com", - }, - "aws-cn": { - "EC2": "ec2.amazonaws.com.cn", - "EKS": "eks.amazonaws.com", - "EKSFargatePods": "eks-fargate-pods.amazonaws.com", - }, -} - const servicePrincipalPartitionMapName = "ServicePrincipalPartitionMap" // MakeServiceRef returns a reference to an intrinsic map function that looks up the servicePrincipalName -// in servicePrincipalPartitionMappings +// in ServicePrincipalPartitionMap. func MakeServiceRef(servicePrincipalName string) *gfnt.Value { return gfnt.MakeFnFindInMap( gfnt.NewString(servicePrincipalPartitionMapName), gfnt.RefPartition, gfnt.NewString(servicePrincipalName), diff --git a/pkg/cfn/builder/testdata/service_details_iso.json b/pkg/cfn/builder/testdata/service_details_iso.json new file mode 100644 index 0000000000..e14d04cd11 --- /dev/null +++ b/pkg/cfn/builder/testdata/service_details_iso.json @@ -0,0 +1,162 @@ +{ + "ServiceNames": [ + "gov.ic.c2s.us-iso-east-1.ec2", + "gov.ic.c2s.us-iso-east-1.ecr.api", + "gov.ic.c2s.us-iso-east-1.ecr.dkr", + "com.amazonaws.us-iso-east-1.s3", + "com.amazonaws.us-iso-east-1.sts" + ], + "ServiceDetails": [ + { + "ServiceType": [ + { + "ServiceType": "Interface" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "PrivateDnsName": "ec2.us-iso-east-1.amazonaws.com", + "ServiceName": "gov.ic.c2s.us-iso-east-1.ec2", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-1", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "AcceptanceRequired": false, + "BaseEndpointDnsNames": [ + "ec2.us-iso-east-1.vpce.amazonaws.com" + ] + }, + { + "ServiceType": [ + { + "ServiceType": "Interface" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "PrivateDnsName": "api.ecr.us-iso-east-1.amazonaws.com", + "ServiceName": "gov.ic.c2s.us-iso-east-1.ecr.api", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-2", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "AcceptanceRequired": false, + "BaseEndpointDnsNames": [ + "api.ecr.us-iso-east-1.vpce.amazonaws.com" + ] + }, + { + "ServiceType": [ + { + "ServiceType": "Interface" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "PrivateDnsName": "*.dkr.ecr.us-iso-east-1.amazonaws.com", + "ServiceName": "gov.ic.c2s.us-iso-east-1.ecr.dkr", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-3", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "AcceptanceRequired": false, + "BaseEndpointDnsNames": [ + "dkr.ecr.us-iso-east-1.vpce.amazonaws.com" + ] + }, + { + "ServiceType": [ + { + "ServiceType": "Gateway" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "AcceptanceRequired": false, + "ServiceName": "com.amazonaws.us-iso-east-1.s3", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-4", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "BaseEndpointDnsNames": [ + "s3.us-iso-east-1.amazonaws.com" + ] + }, + { + "ServiceType": [ + { + "ServiceType": "Interface" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "AcceptanceRequired": false, + "ServiceName": "com.amazonaws.us-iso-east-1.s3", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-5", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "BaseEndpointDnsNames": [ + "s3.us-iso-east-1.amazonaws.com" + ] + }, + { + "ServiceType": [ + { + "ServiceType": "Interface" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "PrivateDnsName": "sts.us-iso-east-1.amazonaws.com", + "ServiceName": "com.amazonaws.us-iso-east-1.sts", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-6", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "AcceptanceRequired": false, + "BaseEndpointDnsNames": [ + "sts.us-iso-east-1.vpce.amazonaws.com" + ] + }, + { + "ServiceType": [ + { + "ServiceType": "Gateway" + } + ], + "Tags": [], + "ManagesVpcEndpoints": false, + "AcceptanceRequired": false, + "ServiceName": "gov.ic.c2s.us-iso-east-1.ec2", + "VpcEndpointPolicySupported": true, + "ServiceId": "vpce-svc-non-existing-endpoint-type", + "Owner": "amazon", + "AvailabilityZones": [ + "us-iso-east-1a", + "us-iso-east-1b" + ], + "BaseEndpointDnsNames": [ + "ec2.us-iso-east-1.amazonaws.com" + ] + } + ] +} diff --git a/pkg/cfn/builder/testdata/service_details_outpost.json b/pkg/cfn/builder/testdata/service_details_outpost.json deleted file mode 100644 index f86c869616..0000000000 --- a/pkg/cfn/builder/testdata/service_details_outpost.json +++ /dev/null @@ -1,336 +0,0 @@ -{ - "ServiceDetails": [ - { - "ServiceName": "com.amazonaws.us-west-2.ec2", - "ServiceId": "vpce-svc-1", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "ec2.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "ec2.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "ec2.us-west-2.amazonaws.com" - }, - { - "PrivateDnsName": "ec2.us-west-2.api.aws" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.ec2messages", - "ServiceId": "vpce-svc-2", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "ec2messages.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "ec2messages.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "ec2messages.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.ecr.api", - "ServiceId": "vpce-svc-3", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "api.ecr.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "api.ecr.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "api.ecr.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.ecr.dkr", - "ServiceId": "vpce-svc-4", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "dkr.ecr.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "*.dkr.ecr.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "*.dkr.ecr.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.s3", - "ServiceId": "vpce-svc-5", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "s3.us-west-2.vpce.amazonaws.com" - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.s3", - "ServiceId": "vpce-svc-6", - "ServiceType": [ - { - "ServiceType": "Gateway" - } - ], - "AvailabilityZones": [ - "us-west-2-lax-1a", - "us-west-2-lax-1b", - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "s3.us-west-2.amazonaws.com" - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.secretsmanager", - "ServiceId": "vpce-svc-7", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "secretsmanager.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "secretsmanager.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "secretsmanager.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.ssm", - "ServiceId": "vpce-svc-8", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "ssm.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "ssm.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "ssm.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.ssmmessages", - "ServiceId": "vpce-svc-9", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "ssmmessages.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "ssmmessages.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "ssmmessages.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - }, - { - "ServiceName": "com.amazonaws.us-west-2.sts", - "ServiceId": "vpce-svc-10", - "ServiceType": [ - { - "ServiceType": "Interface" - } - ], - "AvailabilityZones": [ - "us-west-2a", - "us-west-2b", - "us-west-2c", - "us-west-2d" - ], - "Owner": "amazon", - "BaseEndpointDnsNames": [ - "sts.us-west-2.vpce.amazonaws.com" - ], - "PrivateDnsName": "sts.us-west-2.amazonaws.com", - "PrivateDnsNames": [ - { - "PrivateDnsName": "sts.us-west-2.amazonaws.com" - } - ], - "VpcEndpointPolicySupported": true, - "AcceptanceRequired": false, - "ManagesVpcEndpoints": false, - "Tags": [], - "PrivateDnsNameVerificationState": "verified", - "SupportedIpAddressTypes": [ - "ipv4" - ] - } - ], - "ServiceNames": [ - "com.amazonaws.us-west-2.ec2", - "com.amazonaws.us-west-2.ecr.api", - "com.amazonaws.us-west-2.ecr.dkr", - "com.amazonaws.us-west-2.s3", - "com.amazonaws.us-west-2.sts", - "com.amazonaws.us-west-2.ssm", - "com.amazonaws.us-west-2.ssmmessages", - "com.amazonaws.us-west-2.ec2messages", - "com.amazonaws.us-west-2.secretsmanager" - ] -} diff --git a/pkg/cfn/builder/testdata/vpc_private_iso.json b/pkg/cfn/builder/testdata/vpc_private_iso.json new file mode 100644 index 0000000000..e7754a97dd --- /dev/null +++ b/pkg/cfn/builder/testdata/vpc_private_iso.json @@ -0,0 +1,225 @@ +{ + "AWSTemplateFormatVersion": "2010-09-09", + "Resources": { + "PrivateRouteTableUSISOEAST1A": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": { + "Fn::Sub": "${AWS::StackName}/PrivateRouteTableUSISOEAST1A" + } + } + ], + "VpcId": { + "Ref": "VPC" + } + } + }, + "PrivateRouteTableUSISOEAST1B": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": { + "Fn::Sub": "${AWS::StackName}/PrivateRouteTableUSISOEAST1B" + } + } + ], + "VpcId": { + "Ref": "VPC" + } + } + }, + "RouteTableAssociationPrivateUSISOEAST1A": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "PrivateRouteTableUSISOEAST1A" + }, + "SubnetId": { + "Ref": "SubnetPrivateUSISOEAST1A" + } + } + }, + "RouteTableAssociationPrivateUSISOEAST1B": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "PrivateRouteTableUSISOEAST1B" + }, + "SubnetId": { + "Ref": "SubnetPrivateUSISOEAST1B" + } + } + }, + "SubnetPrivateUSISOEAST1A": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": "us-iso-east-1a", + "CidrBlock": "192.168.64.0/19", + "Tags": [ + { + "Key": "kubernetes.io/role/internal-elb", + "Value": "1" + }, + { + "Key": "Name", + "Value": { + "Fn::Sub": "${AWS::StackName}/SubnetPrivateUSISOEAST1A" + } + } + ], + "VpcId": { + "Ref": "VPC" + } + } + }, + "SubnetPrivateUSISOEAST1B": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AvailabilityZone": "us-iso-east-1b", + "CidrBlock": "192.168.96.0/19", + "Tags": [ + { + "Key": "kubernetes.io/role/internal-elb", + "Value": "1" + }, + { + "Key": "Name", + "Value": { + "Fn::Sub": "${AWS::StackName}/SubnetPrivateUSISOEAST1B" + } + } + ], + "VpcId": { + "Ref": "VPC" + } + } + }, + "VPC": { + "Type": "AWS::EC2::VPC", + "Properties": { + "CidrBlock": "192.168.0.0/16", + "EnableDnsHostnames": true, + "EnableDnsSupport": true, + "Tags": [ + { + "Key": "Name", + "Value": { + "Fn::Sub": "${AWS::StackName}/VPC" + } + } + ] + } + }, + "VPCEndpointEC2": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + "sg-test" + ], + "ServiceName": "gov.ic.c2s.us-iso-east-1.ec2", + "SubnetIds": [ + { + "Ref": "SubnetPrivateUSISOEAST1A" + }, + { + "Ref": "SubnetPrivateUSISOEAST1B" + } + ], + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "VPC" + } + } + }, + "VPCEndpointECRAPI": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + "sg-test" + ], + "ServiceName": "gov.ic.c2s.us-iso-east-1.ecr.api", + "SubnetIds": [ + { + "Ref": "SubnetPrivateUSISOEAST1A" + }, + { + "Ref": "SubnetPrivateUSISOEAST1B" + } + ], + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "VPC" + } + } + }, + "VPCEndpointECRDKR": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + "sg-test" + ], + "ServiceName": "gov.ic.c2s.us-iso-east-1.ecr.dkr", + "SubnetIds": [ + { + "Ref": "SubnetPrivateUSISOEAST1A" + }, + { + "Ref": "SubnetPrivateUSISOEAST1B" + } + ], + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "VPC" + } + } + }, + "VPCEndpointS3": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { + "RouteTableIds": [ + { + "Ref": "PrivateRouteTableUSISOEAST1A" + }, + { + "Ref": "PrivateRouteTableUSISOEAST1B" + } + ], + "ServiceName": "com.amazonaws.us-iso-east-1.s3", + "VpcEndpointType": "Gateway", + "VpcId": { + "Ref": "VPC" + } + } + }, + "VPCEndpointSTS": { + "Type": "AWS::EC2::VPCEndpoint", + "Properties": { + "PrivateDnsEnabled": true, + "SecurityGroupIds": [ + "sg-test" + ], + "ServiceName": "com.amazonaws.us-iso-east-1.sts", + "SubnetIds": [ + { + "Ref": "SubnetPrivateUSISOEAST1A" + }, + { + "Ref": "SubnetPrivateUSISOEAST1B" + } + ], + "VpcEndpointType": "Interface", + "VpcId": { + "Ref": "VPC" + } + } + } + } +} diff --git a/pkg/cfn/builder/vpc.go b/pkg/cfn/builder/vpc.go index 14c3b45645..05f4268fe4 100644 --- a/pkg/cfn/builder/vpc.go +++ b/pkg/cfn/builder/vpc.go @@ -45,7 +45,7 @@ const ( defaultDesiredMaskSize = defaultSubnetMask - defaultPrefix ) -//VPCResourceSet interface for creating cloudformation resource sets for generating VPC resources +// VPCResourceSet interface for creating cloudformation resource sets for generating VPC resources type VPCResourceSet interface { // CreateTemplate generates all of the resources & outputs required for the VPC. Returns the CreateTemplate(ctx context.Context) (vpcID *gfnt.Value, subnetDetails *SubnetDetails, err error) diff --git a/pkg/cfn/builder/vpc_endpoint.go b/pkg/cfn/builder/vpc_endpoint.go index e2099265ec..3563474c22 100644 --- a/pkg/cfn/builder/vpc_endpoint.go +++ b/pkg/cfn/builder/vpc_endpoint.go @@ -118,9 +118,8 @@ func (e *VPCEndpointResourceSet) routeTableIDs() []*gfnt.Value { // buildVPCEndpointServices builds a slice of VPCEndpointServiceDetails for the specified endpoint names. func (e *VPCEndpointResourceSet) buildVPCEndpointServices(ctx context.Context, endpointServices []api.EndpointService) ([]VPCEndpointServiceDetails, error) { serviceNames := make([]string, len(endpointServices)) - serviceDomain := fmt.Sprintf("com.amazonaws.%s", e.region) for i, endpoint := range endpointServices { - serviceNames[i] = makeServiceName(serviceDomain, e.region, endpoint) + serviceNames[i] = makeServiceName(endpoint, e.region) } var ( @@ -158,7 +157,7 @@ func (e *VPCEndpointResourceSet) buildVPCEndpointServices(ctx context.Context, e } var ret []VPCEndpointServiceDetails - s3ServiceName := makeServiceName(serviceDomain, e.region, api.EndpointServiceS3) + s3ServiceName := makeServiceName(api.EndpointServiceS3, e.region) for _, sd := range serviceDetails { if len(sd.ServiceType) > 1 { return nil, fmt.Errorf("endpoint service %q with multiple service types isn't supported", *sd.ServiceName) @@ -172,12 +171,10 @@ func (e *VPCEndpointResourceSet) buildVPCEndpointServices(ctx context.Context, e continue } - // Trim the domain (potentially with a partition-specific part) from the `ServiceName`. - parts := strings.Split(*sd.ServiceName, fmt.Sprintf("%s.", serviceDomain)) - if len(parts) != 2 { - return nil, fmt.Errorf("error parsing service name %s %s", *sd.ServiceName, serviceDomain) + readableName, err := makeReadableName(*sd.ServiceName, e.region) + if err != nil { + return nil, err } - readableName := parts[1] ret = append(ret, VPCEndpointServiceDetails{ ServiceName: *sd.ServiceName, @@ -190,6 +187,15 @@ func (e *VPCEndpointResourceSet) buildVPCEndpointServices(ctx context.Context, e return ret, nil } +func makeReadableName(serviceName, region string) (string, error) { + search := fmt.Sprintf(".%s.", region) + idx := strings.Index(serviceName, search) + if idx == -1 { + return "", fmt.Errorf("unexpected format for endpoint service name: %q", serviceName) + } + return serviceName[idx+len(search)-1:], nil +} + // serviceEndpointTypeExpected returns true if the endpoint service is expected to use the specified endpoint type. func serviceEndpointTypeExpected(serviceName string, endpointType ec2types.ServiceType, s3ServiceName string) bool { if serviceName == s3ServiceName { @@ -198,10 +204,7 @@ func serviceEndpointTypeExpected(serviceName string, endpointType ec2types.Servi return endpointType == ec2types.ServiceTypeInterface } -func makeServiceName(domain, region string, endpointService api.EndpointService) string { - serviceName := fmt.Sprintf("%s.%s", domain, endpointService.Name) - if endpointService.RequiresChinaPrefix && api.Partition(region) == api.PartitionChina { - serviceName = "cn." + serviceName - } - return serviceName +func makeServiceName(endpointService api.EndpointService, region string) string { + serviceDomainPrefix := api.Partitions.GetEndpointServiceDomainPrefix(endpointService, region) + return fmt.Sprintf("%s.%s.%s", serviceDomainPrefix, region, endpointService.Name) } diff --git a/pkg/cfn/builder/vpc_endpoint_test.go b/pkg/cfn/builder/vpc_endpoint_test.go index fa3e2f9704..a12980d5c1 100644 --- a/pkg/cfn/builder/vpc_endpoint_test.go +++ b/pkg/cfn/builder/vpc_endpoint_test.go @@ -42,11 +42,13 @@ var _ = Describe("VPC Endpoint Builder", func() { api.SetClusterConfigDefaults(vc.clusterConfig) if len(vc.clusterConfig.AvailabilityZones) == 0 { - switch api.Partition(vc.clusterConfig.Metadata.Region) { + switch api.Partitions.ForRegion(vc.clusterConfig.Metadata.Region) { case api.PartitionAWS: - vc.clusterConfig.AvailabilityZones = []string{"us-west-2a", "us-west-2b", "us-west-2c", "us-west-2d"} + vc.clusterConfig.AvailabilityZones = makeZones("us-west-2", 4) case api.PartitionChina: - vc.clusterConfig.AvailabilityZones = []string{"cn-north-1a", "cn-north-1b"} + vc.clusterConfig.AvailabilityZones = makeZones("cn-north-1", 2) + case api.PartitionISO: + vc.clusterConfig.AvailabilityZones = makeZones("us-iso-east-1", 2) default: panic("not supported in tests") } @@ -114,7 +116,7 @@ var _ = Describe("VPC Endpoint Builder", func() { }, createProvider: func() api.ClusterProvider { provider := mockprovider.NewMockProvider() - mockDescribeVPCEndpoints(provider, false, false) + mockDescribeVPCEndpoints(provider, serviceDetailsJSON) return provider }, expectedFile: "vpc_private.json", @@ -131,7 +133,7 @@ var _ = Describe("VPC Endpoint Builder", func() { }, createProvider: func() api.ClusterProvider { provider := mockprovider.NewMockProvider() - mockDescribeVPCEndpoints(provider, true, false) + mockDescribeVPCEndpoints(provider, serviceDetailsChinaJSON) provider.SetRegion("cn-north-1") return provider }, @@ -193,7 +195,7 @@ var _ = Describe("VPC Endpoint Builder", func() { createProvider: func() api.ClusterProvider { provider := mockprovider.NewMockProvider() mockDescribeVPC(provider) - mockDescribeVPCEndpoints(provider, false, false) + mockDescribeVPCEndpoints(provider, serviceDetailsJSON) mockDescribeRouteTables(provider, []string{"subnet-custom1", "subnet-custom2"}) return provider }, @@ -226,7 +228,7 @@ var _ = Describe("VPC Endpoint Builder", func() { createProvider: func() api.ClusterProvider { provider := mockprovider.NewMockProvider() mockDescribeVPC(provider) - mockDescribeVPCEndpoints(provider, false, false) + mockDescribeVPCEndpoints(provider, serviceDetailsJSON) mockDescribeRouteTablesSame(provider, []string{"subnet-custom1", "subnet-custom2"}) return provider }, @@ -302,7 +304,7 @@ var _ = Describe("VPC Endpoint Builder", func() { }, createProvider: func() api.ClusterProvider { provider := mockprovider.NewMockProvider() - mockDescribeVPCEndpoints(provider, false, true) + mockDescribeVPCEndpoints(provider, serviceDetailsOutpostsJSON) mockOutposts(provider, "arn:aws:outposts:us-west-2:1234:outpost/op-1234", "us-west-2a") return provider }, @@ -326,13 +328,32 @@ var _ = Describe("VPC Endpoint Builder", func() { }, createProvider: func() api.ClusterProvider { provider := mockprovider.NewMockProvider() - mockDescribeVPCEndpoints(provider, true, true) + mockDescribeVPCEndpoints(provider, serviceDetailsOutpostsChinaJSON) mockOutposts(provider, "arn:aws:outposts:cn-north-1:1234:outpost/op-1234", "cn-north-1a") provider.SetRegion("cn-north-1") return provider }, expectedFile: "vpc_private_outposts_china.json", }), + + Entry("Private cluster in an ISO region", vpcResourceSetCase{ + clusterConfig: &api.ClusterConfig{ + Metadata: &api.ClusterMeta{ + Region: "us-iso-east-1", + }, + VPC: api.NewClusterVPC(false), + PrivateCluster: &api.PrivateCluster{ + Enabled: true, + }, + }, + createProvider: func() api.ClusterProvider { + provider := mockprovider.NewMockProvider() + mockDescribeVPCEndpoints(provider, serviceDetailsISOJSON) + provider.SetRegion("us-iso-east-1") + return provider + }, + expectedFile: "vpc_private_iso.json", + }), ) }) @@ -340,7 +361,7 @@ var _ = Describe("VPC Endpoint Builder", func() { var serviceDetailsJSON []byte //go:embed testdata/service_details_china.json -var serviceDetailsJSONChina []byte +var serviceDetailsChinaJSON []byte //go:embed testdata/service_details_outposts.json var serviceDetailsOutpostsJSON []byte @@ -348,6 +369,9 @@ var serviceDetailsOutpostsJSON []byte //go:embed testdata/service_details_outposts_china.json var serviceDetailsOutpostsChinaJSON []byte +//go:embed testdata/service_details_iso.json +var serviceDetailsISOJSON []byte + func mockDescribeVPC(provider *mockprovider.MockProvider) { provider.MockEC2().On("DescribeVpcs", mock.Anything, &ec2.DescribeVpcsInput{ VpcIds: []string{"vpc-custom"}, @@ -365,21 +389,9 @@ func mockDescribeVPC(provider *mockprovider.MockProvider) { }, nil) } -func mockDescribeVPCEndpoints(provider *mockprovider.MockProvider, china, outposts bool) { - var detailsJSON []byte - switch { - case outposts && china: - detailsJSON = serviceDetailsOutpostsChinaJSON - case outposts: - detailsJSON = serviceDetailsOutpostsJSON - case china: - detailsJSON = serviceDetailsJSONChina - default: - detailsJSON = serviceDetailsJSON - } - +func mockDescribeVPCEndpoints(provider *mockprovider.MockProvider, serviceDetailsJSON []byte) { var output *ec2.DescribeVpcEndpointServicesOutput - Expect(json.Unmarshal(detailsJSON, &output)).To(Succeed()) + Expect(json.Unmarshal(serviceDetailsJSON, &output)).To(Succeed()) provider.MockEC2().On("DescribeVpcEndpointServices", mock.Anything, mock.MatchedBy(func(e *ec2.DescribeVpcEndpointServicesInput) bool { return reflect.DeepEqual(e.ServiceNames, output.ServiceNames) @@ -456,3 +468,11 @@ func mockDescribeRouteTablesSame(provider *mockprovider.MockProvider, subnetIDs return len(input.Filters) > 0 })).Return(output, nil) } + +func makeZones(region string, count int) []string { + var ret []string + for i := 0; i < count; i++ { + ret = append(ret, fmt.Sprintf("%s%c", region, 'a'+i)) + } + return ret +} diff --git a/pkg/cfn/builder/vpc_ipv4.go b/pkg/cfn/builder/vpc_ipv4.go index c3d32a6d21..c0d0f381fb 100644 --- a/pkg/cfn/builder/vpc_ipv4.go +++ b/pkg/cfn/builder/vpc_ipv4.go @@ -335,7 +335,6 @@ var ( sgSourceAnywhereIPv6 = gfnt.NewString("::/0") sgPortZero = gfnt.NewInteger(0) - sgMinNodePort = gfnt.NewInteger(1025) sgMaxNodePort = gfnt.NewInteger(65535) sgPortHTTPS = gfnt.NewInteger(443) diff --git a/pkg/cfn/manager/api.go b/pkg/cfn/manager/api.go index aeaecdb9c3..3533e9d2d9 100644 --- a/pkg/cfn/manager/api.go +++ b/pkg/cfn/manager/api.go @@ -204,13 +204,7 @@ func (c *StackCollection) createClusterStack(ctx context.Context, stackName stri ctx, cancelFunc := context.WithTimeout(context.Background(), c.waitTimeout) defer cancelFunc() - stack, err := waiter.WaitForStack(ctx, c.cloudformationAPI, *stack.StackId, *stack.StackName, func(attempts int) time.Duration { - // Wait 30s for the first two requests, and 1m for subsequent requests. - if attempts <= 2 { - return 30 * time.Second - } - return 1 * time.Minute - }) + stack, err := waiter.WaitForStack(ctx, c.cloudformationAPI, *stack.StackId, *stack.StackName, waiter.ClusterCreationNextDelay) if err != nil { troubleshoot() diff --git a/pkg/cfn/manager/create_tasks.go b/pkg/cfn/manager/create_tasks.go index 09d0a7416f..817c9feb30 100644 --- a/pkg/cfn/manager/create_tasks.go +++ b/pkg/cfn/manager/create_tasks.go @@ -42,7 +42,7 @@ func (c *StackCollection) NewTasksToCreateClusterWithNodeGroups(ctx context.Cont Parallel: true, IsSubTask: true, } - if unmanagedNodeGroupTasks := c.NewUnmanagedNodeGroupTask(ctx, nodeGroups, false, vpcImporter); unmanagedNodeGroupTasks.Len() > 0 { + if unmanagedNodeGroupTasks := c.NewUnmanagedNodeGroupTask(ctx, nodeGroups, false, false, vpcImporter); unmanagedNodeGroupTasks.Len() > 0 { unmanagedNodeGroupTasks.IsSubTask = true nodeGroupTasks.Append(unmanagedNodeGroupTasks) } @@ -72,7 +72,7 @@ func (c *StackCollection) NewTasksToCreateClusterWithNodeGroups(ctx context.Cont } // NewUnmanagedNodeGroupTask defines tasks required to create all of the nodegroups -func (c *StackCollection) NewUnmanagedNodeGroupTask(ctx context.Context, nodeGroups []*api.NodeGroup, forceAddCNIPolicy bool, vpcImporter vpc.Importer) *tasks.TaskTree { +func (c *StackCollection) NewUnmanagedNodeGroupTask(ctx context.Context, nodeGroups []*api.NodeGroup, forceAddCNIPolicy, skipEgressRules bool, vpcImporter vpc.Importer) *tasks.TaskTree { taskTree := &tasks.TaskTree{Parallel: true} for _, ng := range nodeGroups { @@ -83,6 +83,7 @@ func (c *StackCollection) NewUnmanagedNodeGroupTask(ctx context.Context, nodeGro stackCollection: c, forceAddCNIPolicy: forceAddCNIPolicy, vpcImporter: vpcImporter, + skipEgressRules: skipEgressRules, }) // TODO: move authconfigmap tasks here using kubernetesTask and kubernetes.CallbackClientSet } diff --git a/pkg/cfn/manager/delete_tasks.go b/pkg/cfn/manager/delete_tasks.go index 3db515b2d2..303e53f86a 100644 --- a/pkg/cfn/manager/delete_tasks.go +++ b/pkg/cfn/manager/delete_tasks.go @@ -26,8 +26,21 @@ func deleteAll(_ string) bool { return true } type NewOIDCManager func() (*iamoidc.OpenIDConnectManager, error) +// NewTasksToDeleteAddonIAM temporary type, to be removed after moving NewTasksToDeleteClusterWithNodeGroups to actions package +type NewTasksToDeleteAddonIAM func(ctx context.Context, wait bool) (*tasks.TaskTree, error) + // NewTasksToDeleteClusterWithNodeGroups defines tasks required to delete the given cluster along with all of its resources -func (c *StackCollection) NewTasksToDeleteClusterWithNodeGroups(ctx context.Context, clusterStack *Stack, nodeGroupStacks []NodeGroupStack, clusterOperable bool, newOIDCManager NewOIDCManager, cluster *ekstypes.Cluster, clientSetGetter kubernetes.ClientSetGetter, wait, force bool, cleanup func(chan error, string) error) (*tasks.TaskTree, error) { +func (c *StackCollection) NewTasksToDeleteClusterWithNodeGroups( + ctx context.Context, + clusterStack *Stack, + nodeGroupStacks []NodeGroupStack, + clusterOperable bool, + newOIDCManager NewOIDCManager, + newTasksToDeleteAddonIAM NewTasksToDeleteAddonIAM, + cluster *ekstypes.Cluster, + clientSetGetter kubernetes.ClientSetGetter, + wait, force bool, + cleanup func(chan error, string) error) (*tasks.TaskTree, error) { taskTree := &tasks.TaskTree{Parallel: false} nodeGroupTasks, err := c.NewTasksToDeleteNodeGroups(nodeGroupStacks, deleteAll, true, cleanup) @@ -52,7 +65,7 @@ func (c *StackCollection) NewTasksToDeleteClusterWithNodeGroups(ctx context.Cont } } - deleteAddonIAMTasks, err := c.NewTaskToDeleteAddonIAM(ctx, wait) + deleteAddonIAMTasks, err := newTasksToDeleteAddonIAM(ctx, wait) if err != nil { return nil, err } @@ -323,39 +336,6 @@ func stacksToServiceAccountMap(stacks []*types.Stack) map[string]*types.Stack { return stackMap } -// NewTaskToDeleteAddonIAM defines tasks required to delete all of the addons -func (c *StackCollection) NewTaskToDeleteAddonIAM(ctx context.Context, wait bool) (*tasks.TaskTree, error) { - stacks, err := c.GetIAMAddonsStacks(ctx) - if err != nil { - return nil, err - } - taskTree := &tasks.TaskTree{Parallel: true} - for _, s := range stacks { - info := fmt.Sprintf("delete addon IAM %q", *s.StackName) - - deleteStackTasks := &tasks.TaskTree{ - Parallel: false, - IsSubTask: true, - } - if wait { - deleteStackTasks.Append(&taskWithStackSpec{ - info: info, - stack: s, - call: c.DeleteStackBySpecSync, - }) - } else { - deleteStackTasks.Append(&asyncTaskWithStackSpec{ - info: info, - stack: s, - call: c.DeleteStackBySpec, - }) - } - taskTree.Append(deleteStackTasks) - } - return taskTree, nil - -} - func clusterHasOIDCProvider(cluster *ekstypes.Cluster) (hasOIDC bool, found bool) { for k, v := range cluster.Tags { if k == api.ClusterOIDCEnabledTag { diff --git a/pkg/cfn/manager/fakes/fake_stack_manager.go b/pkg/cfn/manager/fakes/fake_stack_manager.go index 2aa38a5bce..4c95b38e23 100644 --- a/pkg/cfn/manager/fakes/fake_stack_manager.go +++ b/pkg/cfn/manager/fakes/fake_stack_manager.go @@ -606,20 +606,6 @@ type FakeStackManager struct { newManagedNodeGroupTaskReturnsOnCall map[int]struct { result1 *tasks.TaskTree } - NewTaskToDeleteAddonIAMStub func(context.Context, bool) (*tasks.TaskTree, error) - newTaskToDeleteAddonIAMMutex sync.RWMutex - newTaskToDeleteAddonIAMArgsForCall []struct { - arg1 context.Context - arg2 bool - } - newTaskToDeleteAddonIAMReturns struct { - result1 *tasks.TaskTree - result2 error - } - newTaskToDeleteAddonIAMReturnsOnCall map[int]struct { - result1 *tasks.TaskTree - result2 error - } NewTaskToDeleteUnownedNodeGroupStub func(context.Context, string, string, awsapi.EKS, *manager.DeleteWaitCondition) tasks.Task newTaskToDeleteUnownedNodeGroupMutex sync.RWMutex newTaskToDeleteUnownedNodeGroupArgsForCall []struct { @@ -662,7 +648,7 @@ type FakeStackManager struct { newTasksToCreateIAMServiceAccountsReturnsOnCall map[int]struct { result1 *tasks.TaskTree } - NewTasksToDeleteClusterWithNodeGroupsStub func(context.Context, *types.Stack, []manager.NodeGroupStack, bool, manager.NewOIDCManager, *typesc.Cluster, kubernetes.ClientSetGetter, bool, bool, func(chan error, string) error) (*tasks.TaskTree, error) + NewTasksToDeleteClusterWithNodeGroupsStub func(context.Context, *types.Stack, []manager.NodeGroupStack, bool, manager.NewOIDCManager, manager.NewTasksToDeleteAddonIAM, *typesc.Cluster, kubernetes.ClientSetGetter, bool, bool, func(chan error, string) error) (*tasks.TaskTree, error) newTasksToDeleteClusterWithNodeGroupsMutex sync.RWMutex newTasksToDeleteClusterWithNodeGroupsArgsForCall []struct { arg1 context.Context @@ -670,11 +656,12 @@ type FakeStackManager struct { arg3 []manager.NodeGroupStack arg4 bool arg5 manager.NewOIDCManager - arg6 *typesc.Cluster - arg7 kubernetes.ClientSetGetter - arg8 bool + arg6 manager.NewTasksToDeleteAddonIAM + arg7 *typesc.Cluster + arg8 kubernetes.ClientSetGetter arg9 bool - arg10 func(chan error, string) error + arg10 bool + arg11 func(chan error, string) error } newTasksToDeleteClusterWithNodeGroupsReturns struct { result1 *tasks.TaskTree @@ -733,13 +720,14 @@ type FakeStackManager struct { result1 *tasks.TaskTree result2 error } - NewUnmanagedNodeGroupTaskStub func(context.Context, []*v1alpha5.NodeGroup, bool, vpc.Importer) *tasks.TaskTree + NewUnmanagedNodeGroupTaskStub func(context.Context, []*v1alpha5.NodeGroup, bool, bool, vpc.Importer) *tasks.TaskTree newUnmanagedNodeGroupTaskMutex sync.RWMutex newUnmanagedNodeGroupTaskArgsForCall []struct { arg1 context.Context arg2 []*v1alpha5.NodeGroup arg3 bool - arg4 vpc.Importer + arg4 bool + arg5 vpc.Importer } newUnmanagedNodeGroupTaskReturns struct { result1 *tasks.TaskTree @@ -3633,71 +3621,6 @@ func (fake *FakeStackManager) NewManagedNodeGroupTaskReturnsOnCall(i int, result }{result1} } -func (fake *FakeStackManager) NewTaskToDeleteAddonIAM(arg1 context.Context, arg2 bool) (*tasks.TaskTree, error) { - fake.newTaskToDeleteAddonIAMMutex.Lock() - ret, specificReturn := fake.newTaskToDeleteAddonIAMReturnsOnCall[len(fake.newTaskToDeleteAddonIAMArgsForCall)] - fake.newTaskToDeleteAddonIAMArgsForCall = append(fake.newTaskToDeleteAddonIAMArgsForCall, struct { - arg1 context.Context - arg2 bool - }{arg1, arg2}) - stub := fake.NewTaskToDeleteAddonIAMStub - fakeReturns := fake.newTaskToDeleteAddonIAMReturns - fake.recordInvocation("NewTaskToDeleteAddonIAM", []interface{}{arg1, arg2}) - fake.newTaskToDeleteAddonIAMMutex.Unlock() - if stub != nil { - return stub(arg1, arg2) - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeStackManager) NewTaskToDeleteAddonIAMCallCount() int { - fake.newTaskToDeleteAddonIAMMutex.RLock() - defer fake.newTaskToDeleteAddonIAMMutex.RUnlock() - return len(fake.newTaskToDeleteAddonIAMArgsForCall) -} - -func (fake *FakeStackManager) NewTaskToDeleteAddonIAMCalls(stub func(context.Context, bool) (*tasks.TaskTree, error)) { - fake.newTaskToDeleteAddonIAMMutex.Lock() - defer fake.newTaskToDeleteAddonIAMMutex.Unlock() - fake.NewTaskToDeleteAddonIAMStub = stub -} - -func (fake *FakeStackManager) NewTaskToDeleteAddonIAMArgsForCall(i int) (context.Context, bool) { - fake.newTaskToDeleteAddonIAMMutex.RLock() - defer fake.newTaskToDeleteAddonIAMMutex.RUnlock() - argsForCall := fake.newTaskToDeleteAddonIAMArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2 -} - -func (fake *FakeStackManager) NewTaskToDeleteAddonIAMReturns(result1 *tasks.TaskTree, result2 error) { - fake.newTaskToDeleteAddonIAMMutex.Lock() - defer fake.newTaskToDeleteAddonIAMMutex.Unlock() - fake.NewTaskToDeleteAddonIAMStub = nil - fake.newTaskToDeleteAddonIAMReturns = struct { - result1 *tasks.TaskTree - result2 error - }{result1, result2} -} - -func (fake *FakeStackManager) NewTaskToDeleteAddonIAMReturnsOnCall(i int, result1 *tasks.TaskTree, result2 error) { - fake.newTaskToDeleteAddonIAMMutex.Lock() - defer fake.newTaskToDeleteAddonIAMMutex.Unlock() - fake.NewTaskToDeleteAddonIAMStub = nil - if fake.newTaskToDeleteAddonIAMReturnsOnCall == nil { - fake.newTaskToDeleteAddonIAMReturnsOnCall = make(map[int]struct { - result1 *tasks.TaskTree - result2 error - }) - } - fake.newTaskToDeleteAddonIAMReturnsOnCall[i] = struct { - result1 *tasks.TaskTree - result2 error - }{result1, result2} -} - func (fake *FakeStackManager) NewTaskToDeleteUnownedNodeGroup(arg1 context.Context, arg2 string, arg3 string, arg4 awsapi.EKS, arg5 *manager.DeleteWaitCondition) tasks.Task { fake.newTaskToDeleteUnownedNodeGroupMutex.Lock() ret, specificReturn := fake.newTaskToDeleteUnownedNodeGroupReturnsOnCall[len(fake.newTaskToDeleteUnownedNodeGroupArgsForCall)] @@ -3905,7 +3828,7 @@ func (fake *FakeStackManager) NewTasksToCreateIAMServiceAccountsReturnsOnCall(i }{result1} } -func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroups(arg1 context.Context, arg2 *types.Stack, arg3 []manager.NodeGroupStack, arg4 bool, arg5 manager.NewOIDCManager, arg6 *typesc.Cluster, arg7 kubernetes.ClientSetGetter, arg8 bool, arg9 bool, arg10 func(chan error, string) error) (*tasks.TaskTree, error) { +func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroups(arg1 context.Context, arg2 *types.Stack, arg3 []manager.NodeGroupStack, arg4 bool, arg5 manager.NewOIDCManager, arg6 manager.NewTasksToDeleteAddonIAM, arg7 *typesc.Cluster, arg8 kubernetes.ClientSetGetter, arg9 bool, arg10 bool, arg11 func(chan error, string) error) (*tasks.TaskTree, error) { var arg3Copy []manager.NodeGroupStack if arg3 != nil { arg3Copy = make([]manager.NodeGroupStack, len(arg3)) @@ -3919,18 +3842,19 @@ func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroups(arg1 context arg3 []manager.NodeGroupStack arg4 bool arg5 manager.NewOIDCManager - arg6 *typesc.Cluster - arg7 kubernetes.ClientSetGetter - arg8 bool + arg6 manager.NewTasksToDeleteAddonIAM + arg7 *typesc.Cluster + arg8 kubernetes.ClientSetGetter arg9 bool - arg10 func(chan error, string) error - }{arg1, arg2, arg3Copy, arg4, arg5, arg6, arg7, arg8, arg9, arg10}) + arg10 bool + arg11 func(chan error, string) error + }{arg1, arg2, arg3Copy, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11}) stub := fake.NewTasksToDeleteClusterWithNodeGroupsStub fakeReturns := fake.newTasksToDeleteClusterWithNodeGroupsReturns - fake.recordInvocation("NewTasksToDeleteClusterWithNodeGroups", []interface{}{arg1, arg2, arg3Copy, arg4, arg5, arg6, arg7, arg8, arg9, arg10}) + fake.recordInvocation("NewTasksToDeleteClusterWithNodeGroups", []interface{}{arg1, arg2, arg3Copy, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11}) fake.newTasksToDeleteClusterWithNodeGroupsMutex.Unlock() if stub != nil { - return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11) } if specificReturn { return ret.result1, ret.result2 @@ -3944,17 +3868,17 @@ func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroupsCallCount() i return len(fake.newTasksToDeleteClusterWithNodeGroupsArgsForCall) } -func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroupsCalls(stub func(context.Context, *types.Stack, []manager.NodeGroupStack, bool, manager.NewOIDCManager, *typesc.Cluster, kubernetes.ClientSetGetter, bool, bool, func(chan error, string) error) (*tasks.TaskTree, error)) { +func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroupsCalls(stub func(context.Context, *types.Stack, []manager.NodeGroupStack, bool, manager.NewOIDCManager, manager.NewTasksToDeleteAddonIAM, *typesc.Cluster, kubernetes.ClientSetGetter, bool, bool, func(chan error, string) error) (*tasks.TaskTree, error)) { fake.newTasksToDeleteClusterWithNodeGroupsMutex.Lock() defer fake.newTasksToDeleteClusterWithNodeGroupsMutex.Unlock() fake.NewTasksToDeleteClusterWithNodeGroupsStub = stub } -func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroupsArgsForCall(i int) (context.Context, *types.Stack, []manager.NodeGroupStack, bool, manager.NewOIDCManager, *typesc.Cluster, kubernetes.ClientSetGetter, bool, bool, func(chan error, string) error) { +func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroupsArgsForCall(i int) (context.Context, *types.Stack, []manager.NodeGroupStack, bool, manager.NewOIDCManager, manager.NewTasksToDeleteAddonIAM, *typesc.Cluster, kubernetes.ClientSetGetter, bool, bool, func(chan error, string) error) { fake.newTasksToDeleteClusterWithNodeGroupsMutex.RLock() defer fake.newTasksToDeleteClusterWithNodeGroupsMutex.RUnlock() argsForCall := fake.newTasksToDeleteClusterWithNodeGroupsArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4, argsForCall.arg5, argsForCall.arg6, argsForCall.arg7, argsForCall.arg8, argsForCall.arg9, argsForCall.arg10 + return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4, argsForCall.arg5, argsForCall.arg6, argsForCall.arg7, argsForCall.arg8, argsForCall.arg9, argsForCall.arg10, argsForCall.arg11 } func (fake *FakeStackManager) NewTasksToDeleteClusterWithNodeGroupsReturns(result1 *tasks.TaskTree, result2 error) { @@ -4195,7 +4119,7 @@ func (fake *FakeStackManager) NewTasksToDeleteOIDCProviderWithIAMServiceAccounts }{result1, result2} } -func (fake *FakeStackManager) NewUnmanagedNodeGroupTask(arg1 context.Context, arg2 []*v1alpha5.NodeGroup, arg3 bool, arg4 vpc.Importer) *tasks.TaskTree { +func (fake *FakeStackManager) NewUnmanagedNodeGroupTask(arg1 context.Context, arg2 []*v1alpha5.NodeGroup, arg3 bool, arg4 bool, arg5 vpc.Importer) *tasks.TaskTree { var arg2Copy []*v1alpha5.NodeGroup if arg2 != nil { arg2Copy = make([]*v1alpha5.NodeGroup, len(arg2)) @@ -4207,14 +4131,15 @@ func (fake *FakeStackManager) NewUnmanagedNodeGroupTask(arg1 context.Context, ar arg1 context.Context arg2 []*v1alpha5.NodeGroup arg3 bool - arg4 vpc.Importer - }{arg1, arg2Copy, arg3, arg4}) + arg4 bool + arg5 vpc.Importer + }{arg1, arg2Copy, arg3, arg4, arg5}) stub := fake.NewUnmanagedNodeGroupTaskStub fakeReturns := fake.newUnmanagedNodeGroupTaskReturns - fake.recordInvocation("NewUnmanagedNodeGroupTask", []interface{}{arg1, arg2Copy, arg3, arg4}) + fake.recordInvocation("NewUnmanagedNodeGroupTask", []interface{}{arg1, arg2Copy, arg3, arg4, arg5}) fake.newUnmanagedNodeGroupTaskMutex.Unlock() if stub != nil { - return stub(arg1, arg2, arg3, arg4) + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 @@ -4228,17 +4153,17 @@ func (fake *FakeStackManager) NewUnmanagedNodeGroupTaskCallCount() int { return len(fake.newUnmanagedNodeGroupTaskArgsForCall) } -func (fake *FakeStackManager) NewUnmanagedNodeGroupTaskCalls(stub func(context.Context, []*v1alpha5.NodeGroup, bool, vpc.Importer) *tasks.TaskTree) { +func (fake *FakeStackManager) NewUnmanagedNodeGroupTaskCalls(stub func(context.Context, []*v1alpha5.NodeGroup, bool, bool, vpc.Importer) *tasks.TaskTree) { fake.newUnmanagedNodeGroupTaskMutex.Lock() defer fake.newUnmanagedNodeGroupTaskMutex.Unlock() fake.NewUnmanagedNodeGroupTaskStub = stub } -func (fake *FakeStackManager) NewUnmanagedNodeGroupTaskArgsForCall(i int) (context.Context, []*v1alpha5.NodeGroup, bool, vpc.Importer) { +func (fake *FakeStackManager) NewUnmanagedNodeGroupTaskArgsForCall(i int) (context.Context, []*v1alpha5.NodeGroup, bool, bool, vpc.Importer) { fake.newUnmanagedNodeGroupTaskMutex.RLock() defer fake.newUnmanagedNodeGroupTaskMutex.RUnlock() argsForCall := fake.newUnmanagedNodeGroupTaskArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4 + return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4, argsForCall.arg5 } func (fake *FakeStackManager) NewUnmanagedNodeGroupTaskReturns(result1 *tasks.TaskTree) { @@ -4672,8 +4597,6 @@ func (fake *FakeStackManager) Invocations() map[string][][]interface{} { defer fake.makeClusterStackNameMutex.RUnlock() fake.newManagedNodeGroupTaskMutex.RLock() defer fake.newManagedNodeGroupTaskMutex.RUnlock() - fake.newTaskToDeleteAddonIAMMutex.RLock() - defer fake.newTaskToDeleteAddonIAMMutex.RUnlock() fake.newTaskToDeleteUnownedNodeGroupMutex.RLock() defer fake.newTaskToDeleteUnownedNodeGroupMutex.RUnlock() fake.newTasksToCreateClusterWithNodeGroupsMutex.RLock() diff --git a/pkg/cfn/manager/interface.go b/pkg/cfn/manager/interface.go index 82d596423d..3dc4ca91b5 100644 --- a/pkg/cfn/manager/interface.go +++ b/pkg/cfn/manager/interface.go @@ -83,15 +83,14 @@ type StackManager interface { MakeChangeSetName(action string) string MakeClusterStackName() string NewManagedNodeGroupTask(ctx context.Context, nodeGroups []*v1alpha5.ManagedNodeGroup, forceAddCNIPolicy bool, importer vpc.Importer) *tasks.TaskTree - NewTaskToDeleteAddonIAM(ctx context.Context, wait bool) (*tasks.TaskTree, error) NewTaskToDeleteUnownedNodeGroup(ctx context.Context, clusterName, nodegroup string, eksAPI awsapi.EKS, waitCondition *DeleteWaitCondition) tasks.Task NewTasksToCreateClusterWithNodeGroups(ctx context.Context, nodeGroups []*v1alpha5.NodeGroup, managedNodeGroups []*v1alpha5.ManagedNodeGroup, postClusterCreationTasks ...tasks.Task) *tasks.TaskTree NewTasksToCreateIAMServiceAccounts(serviceAccounts []*v1alpha5.ClusterIAMServiceAccount, oidc *iamoidc.OpenIDConnectManager, clientSetGetter kubernetes.ClientSetGetter) *tasks.TaskTree - NewTasksToDeleteClusterWithNodeGroups(ctx context.Context, clusterStack *Stack, nodeGroupStacks []NodeGroupStack, clusterOperable bool, newOIDCManager NewOIDCManager, cluster *ekstypes.Cluster, clientSetGetter kubernetes.ClientSetGetter, wait, force bool, cleanup func(chan error, string) error) (*tasks.TaskTree, error) + NewTasksToDeleteClusterWithNodeGroups(ctx context.Context, clusterStack *Stack, nodeGroupStacks []NodeGroupStack, clusterOperable bool, newOIDCManager NewOIDCManager, newTasksToDeleteAddonIAM NewTasksToDeleteAddonIAM, cluster *ekstypes.Cluster, clientSetGetter kubernetes.ClientSetGetter, wait, force bool, cleanup func(chan error, string) error) (*tasks.TaskTree, error) NewTasksToDeleteIAMServiceAccounts(ctx context.Context, serviceAccounts []string, clientSetGetter kubernetes.ClientSetGetter, wait bool) (*tasks.TaskTree, error) NewTasksToDeleteNodeGroups(stacks []NodeGroupStack, shouldDelete func(_ string) bool, wait bool, cleanup func(chan error, string) error) (*tasks.TaskTree, error) NewTasksToDeleteOIDCProviderWithIAMServiceAccounts(ctx context.Context, newOIDCManager NewOIDCManager, cluster *ekstypes.Cluster, clientSetGetter kubernetes.ClientSetGetter, force bool) (*tasks.TaskTree, error) - NewUnmanagedNodeGroupTask(ctx context.Context, nodeGroups []*v1alpha5.NodeGroup, forceAddCNIPolicy bool, importer vpc.Importer) *tasks.TaskTree + NewUnmanagedNodeGroupTask(ctx context.Context, nodeGroups []*v1alpha5.NodeGroup, forceAddCNIPolicy, skipEgressRules bool, importer vpc.Importer) *tasks.TaskTree PropagateManagedNodeGroupTagsToASG(ngName string, ngTags map[string]string, asgNames []string, errCh chan error) error RefreshFargatePodExecutionRoleARN(ctx context.Context) error StackStatusIsNotTransitional(s *Stack) bool diff --git a/pkg/cfn/manager/nodegroup.go b/pkg/cfn/manager/nodegroup.go index f20101a9ff..bfe2eac969 100644 --- a/pkg/cfn/manager/nodegroup.go +++ b/pkg/cfn/manager/nodegroup.go @@ -36,7 +36,7 @@ func (c *StackCollection) makeNodeGroupStackName(name string) string { } // createNodeGroupTask creates the nodegroup -func (c *StackCollection) createNodeGroupTask(ctx context.Context, errs chan error, ng *api.NodeGroup, forceAddCNIPolicy bool, vpcImporter vpc.Importer) error { +func (c *StackCollection) createNodeGroupTask(ctx context.Context, errs chan error, ng *api.NodeGroup, forceAddCNIPolicy, skipEgressRules bool, vpcImporter vpc.Importer) error { name := c.makeNodeGroupStackName(ng.Name) logger.Info("building nodegroup stack %q", name) @@ -44,7 +44,14 @@ func (c *StackCollection) createNodeGroupTask(ctx context.Context, errs chan err if err != nil { return errors.Wrap(err, "error creating bootstrapper") } - stack := builder.NewNodeGroupResourceSet(c.ec2API, c.iamAPI, c.spec, ng, bootstrapper, forceAddCNIPolicy, vpcImporter) + stack := builder.NewNodeGroupResourceSet(c.ec2API, c.iamAPI, builder.NodeGroupOptions{ + ClusterConfig: c.spec, + NodeGroup: ng, + Bootstrapper: bootstrapper, + ForceAddCNIPolicy: forceAddCNIPolicy, + VPCImporter: vpcImporter, + SkipEgressRules: skipEgressRules, + }) if err := stack.AddAllResources(ctx); err != nil { return err } @@ -195,7 +202,6 @@ func (c *StackCollection) DescribeNodeGroupStacksAndResources(ctx context.Contex } func (c *StackCollection) GetAutoScalingGroupName(ctx context.Context, s *Stack) (string, error) { - nodeGroupType, err := GetNodeGroupType(s.Tags) if err != nil { return "", err @@ -220,7 +226,7 @@ func (c *StackCollection) GetAutoScalingGroupName(ctx context.Context, s *Stack) } } -// GetNodeGroupAutoScalingGroupName returns the unmanaged nodegroup's AutoScalingGroupName +// GetUnmanagedNodeGroupAutoScalingGroupName returns the unmanaged nodegroup's AutoScalingGroupName. func (c *StackCollection) GetUnmanagedNodeGroupAutoScalingGroupName(ctx context.Context, s *Stack) (string, error) { input := &cfn.DescribeStackResourceInput{ StackName: s.StackName, diff --git a/pkg/cfn/manager/tasks.go b/pkg/cfn/manager/tasks.go index 1dcd016599..2569c31140 100644 --- a/pkg/cfn/manager/tasks.go +++ b/pkg/cfn/manager/tasks.go @@ -33,11 +33,12 @@ type nodeGroupTask struct { forceAddCNIPolicy bool vpcImporter vpc.Importer stackCollection *StackCollection + skipEgressRules bool } func (t *nodeGroupTask) Describe() string { return t.info } func (t *nodeGroupTask) Do(errs chan error) error { - return t.stackCollection.createNodeGroupTask(t.ctx, errs, t.nodeGroup, t.forceAddCNIPolicy, t.vpcImporter) + return t.stackCollection.createNodeGroupTask(t.ctx, errs, t.nodeGroup, t.forceAddCNIPolicy, t.skipEgressRules, t.vpcImporter) } type managedNodeGroupTask struct { diff --git a/pkg/cfn/manager/tasks_test.go b/pkg/cfn/manager/tasks_test.go index ccc336f89b..a4f2d051ac 100644 --- a/pkg/cfn/manager/tasks_test.go +++ b/pkg/cfn/manager/tasks_test.go @@ -80,22 +80,22 @@ var _ = Describe("StackCollection Tasks", func() { // The supportsManagedNodes argument has no effect on the Describe call, so the values are alternated // in these tests { - tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), makeNodeGroups("bar", "foo"), false, fakeVPCImporter) + tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), makeNodeGroups("bar", "foo"), false, false, fakeVPCImporter) Expect(tasks.Describe()).To(Equal(` 2 parallel tasks: { create nodegroup "bar", create nodegroup "foo" } `)) } { - tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), makeNodeGroups("bar"), false, fakeVPCImporter) + tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), makeNodeGroups("bar"), false, false, fakeVPCImporter) Expect(tasks.Describe()).To(Equal(`1 task: { create nodegroup "bar" }`)) } { - tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), makeNodeGroups("foo"), false, fakeVPCImporter) + tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), makeNodeGroups("foo"), false, false, fakeVPCImporter) Expect(tasks.Describe()).To(Equal(`1 task: { create nodegroup "foo" }`)) } { - tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), nil, false, fakeVPCImporter) + tasks := stackManager.NewUnmanagedNodeGroupTask(context.Background(), nil, false, false, fakeVPCImporter) Expect(tasks.Describe()).To(Equal(`no tasks`)) } { diff --git a/pkg/cfn/waiter/stack.go b/pkg/cfn/waiter/stack.go index 99eb0fc6ee..0b7637edb1 100644 --- a/pkg/cfn/waiter/stack.go +++ b/pkg/cfn/waiter/stack.go @@ -13,6 +13,14 @@ import ( "github.com/weaveworks/eksctl/pkg/awsapi" ) +var ClusterCreationNextDelay = func(attempts int) time.Duration { + // Wait 30s for the first two requests, and 1m for subsequent requests. + if attempts <= 2 { + return 30 * time.Second + } + return 1 * time.Minute +} + // NextDelay returns the amount of time to wait before the next retry given the number of attempts. type NextDelay func(attempts int) time.Duration diff --git a/pkg/credentials/filecache.go b/pkg/credentials/filecache.go index 1b733b901c..f25d7dab5f 100644 --- a/pkg/credentials/filecache.go +++ b/pkg/credentials/filecache.go @@ -2,11 +2,9 @@ package credentials import ( "context" - "errors" "fmt" "os" "path/filepath" - "sync" "time" "github.com/aws/aws-sdk-go/aws/credentials" @@ -22,8 +20,9 @@ const ( EksctlCacheFilenameEnvName = "EKSCTL_CREDENTIAL_CACHE_FILENAME" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate // Clock implements Now to return the current time. +// +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate //counterfeiter:generate -o fakes/fake_clock.go . Clock type Clock interface { Now() time.Time @@ -40,6 +39,7 @@ func (r *RealClock) Now() time.Time { // Flock provides an interface to handle file locking. // It defines an interface for the Flock type from github.com/gofrs/flock. // Refer to https://pkg.go.dev/github.com/gofrs/flock?utm_source=godoc#Flock for documentation. +// //counterfeiter:generate -o fakes/fake_flock.go . Flock type Flock interface { // TryRLockContext repeatedly tries to take a shared lock until one of the @@ -63,19 +63,6 @@ type cachedCredential struct { Expiration time.Time } -// FileCacheProvider is a file based AWS Credentials Provider implementing expiry and retrieve. -type FileCacheProvider struct { - credentials *credentials.Credentials // the underlying implementation that has the *real* Provider - cachedCredential cachedCredential // the cached credential, if it exists - profile string - clock Clock - cacheFilePath string - - fs afero.Fs - newFlock FlockFunc - once sync.Once -} - type cacheFile struct { // a map of profiles to cachedCredentials ProfileMap map[string]cachedCredential `yaml:"profiles"` @@ -115,29 +102,6 @@ func initializeCache(fs afero.Fs, cacheFilePath string) error { return err } -// NewFileCacheProvider creates a new filesystem based AWS credential cache. The cache uses Expiry provided by the -// AWS Go SDK for providers. It wraps the configured credential provider into a file based cache provider. If the provider -// does not support caching ( I.e.: it doesn't implement IsExpired ) then this file based caching system is ignored -// and the default credential provider is used. Caches are per profile. -func NewFileCacheProvider(profile string, creds *credentials.Credentials, clock Clock, fs afero.Fs, newFlock FlockFunc, cacheFilePath string) (FileCacheProvider, error) { - if creds == nil { - return FileCacheProvider{}, errors.New("no underlying Credentials object provided") - } - - if err := initializeCache(fs, cacheFilePath); err != nil { - return FileCacheProvider{}, fmt.Errorf("error initializing credentials cache: %w", err) - } - - return FileCacheProvider{ - profile: profile, - credentials: creds, - clock: clock, - cacheFilePath: cacheFilePath, - fs: fs, - newFlock: newFlock, - }, nil -} - // readCacheFile reads the contents of the credential cache and returns the // parsed yaml as a cachedCredential object. func readCacheFile(fs afero.Fs, filename string, newFlock FlockFunc) (cacheFile, error) { @@ -190,63 +154,6 @@ func writeCache(fs afero.Fs, filename string, newFlock FlockFunc, cache cacheFil return err } -// Retrieve implements the Provider interface, returning the cached credential if is not expired, -// otherwise fetching the credential from the underlying Provider and caching the results on disk -// with an expiration time. -func (f *FileCacheProvider) Retrieve() (credentials.Value, error) { - f.once.Do(func() { - cacheFile, err := readCacheFile(f.fs, f.cacheFilePath, f.newFlock) - if err != nil { - logger.Warning("error reading cache file: %v", err) - return - } - f.cachedCredential = cacheFile.Get(f.profile) - }) - - if !f.cachedCredential.Expiration.Before(f.clock.Now()) { - // use the cached credential - return f.cachedCredential.Credential, nil - } - logger.Info("No cached credential available. Refreshing...") - // fetch the credentials from the underlying Provider - credential, err := f.credentials.Get() - if err != nil { - return credential, err - } - expiration, err := f.credentials.ExpiresAt() - if err != nil { - // credential doesn't support expiration time, so can't cache, but still return the credential - logger.Warning("Unable to cache credential: %v\n", err) - return credential, nil - } - // underlying provider supports Expirer interface, so we can cache - f.cachedCredential = cachedCredential{ - Credential: credential, - Expiration: expiration, - } - // overwrite whatever was there before. we don't care about multiple creds for various clusters. - // if user switches to another role and another profile they have to re-authenticate. - cache, _ := readCacheFile(f.fs, f.cacheFilePath, f.newFlock) - cache.Put(f.profile, f.cachedCredential) - if err := writeCache(f.fs, f.cacheFilePath, f.newFlock, cache); err != nil { - logger.Warning("Unable to update credential cache %s: %v\n", f.cacheFilePath, err) - return credential, err - } - logger.Info("Updated cached credential\n") - return credential, nil -} - -// IsExpired implements the Provider interface, deferring to the cached credential first, -// but fall back to the underlying Provider if it is expired. -func (f *FileCacheProvider) IsExpired() bool { - return f.cachedCredential.Expiration.Before(f.clock.Now()) && f.credentials.IsExpired() -} - -// ExpiresAt implements the Expirer interface, and gives access to the expiration time of the credential -func (f *FileCacheProvider) ExpiresAt() time.Time { - return f.cachedCredential.Expiration -} - func parseCacheFile(fs afero.Fs, filename string) (cacheFile, error) { cache := cacheFile{ ProfileMap: make(map[string]cachedCredential), diff --git a/pkg/credentials/filecache_test.go b/pkg/credentials/filecache_test.go deleted file mode 100644 index fa10c8fe97..0000000000 --- a/pkg/credentials/filecache_test.go +++ /dev/null @@ -1,184 +0,0 @@ -package credentials_test - -import ( - "fmt" - "os" - "path/filepath" - "time" - - "github.com/gofrs/flock" - - "github.com/spf13/afero" - - "github.com/aws/aws-sdk-go/aws/credentials" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - - . "github.com/weaveworks/eksctl/pkg/credentials" - "github.com/weaveworks/eksctl/pkg/credentials/fakes" -) - -type stubProvider struct { - creds credentials.Value - expired bool - err error -} - -func (s *stubProvider) Retrieve() (credentials.Value, error) { - s.expired = false - s.creds.ProviderName = "stubProvider" - return s.creds, s.err -} - -func (s *stubProvider) IsExpired() bool { - return s.expired -} - -type stubProviderExpirer struct { - stubProvider - expiration time.Time -} - -func (s *stubProviderExpirer) ExpiresAt() time.Time { - return s.expiration -} - -var _ = Describe("filecache", func() { - newFileCacheProvider := func(profile string, c *credentials.Credentials, clock Clock, cacheDir string) (FileCacheProvider, error) { - return NewFileCacheProvider(profile, c, clock, afero.NewOsFs(), func(path string) Flock { - return flock.New(path) - }, filepath.Join(cacheDir, "credentials.yaml")) - } - Context("credential cache has being used", func() { - var ( - tmp string - err error - ) - BeforeEach(func() { - tmp, err = os.MkdirTemp("", "filecache") - Expect(err).NotTo(HaveOccurred()) - _ = os.Setenv(EksctlCacheFilenameEnvName, filepath.Join(tmp, "credentials.yaml")) - }) - AfterEach(func() { - _ = os.RemoveAll(tmp) - }) - It("will provide a working file based cache", func() { - c := credentials.NewCredentials(&stubProviderExpirer{ - stubProvider: stubProvider{ - creds: credentials.Value{ - AccessKeyID: "id", - SecretAccessKey: "secret", - SessionToken: "token", - ProviderName: "stubProvider", - }, - }, - }) - fakeClock := &fakes.FakeClock{} - fakeClock.NowReturns(time.Date(1981, 1, 1, 1, 1, 1, 1, time.UTC)) - p, err := newFileCacheProvider("profile", c, fakeClock, tmp) - Expect(err).NotTo(HaveOccurred()) - value, err := p.Retrieve() - Expect(err).NotTo(HaveOccurred()) - Expect(value.AccessKeyID).To(Equal("id")) - Expect(value.SecretAccessKey).To(Equal("secret")) - Expect(value.SessionToken).To(Equal("token")) - Expect(p.IsExpired()).NotTo(BeTrue()) - content, err := os.ReadFile(filepath.Join(tmp, "credentials.yaml")) - Expect(err).NotTo(HaveOccurred()) - Expect(string(content)).To(Equal(`profiles: - profile: - credential: - accesskeyid: id - secretaccesskey: secret - sessiontoken: token - providername: stubProvider - expiration: 0001-01-01T00:00:00Z -`)) - }) - When("the cache expires", func() { - It("will ask to refresh it", func() { - c := credentials.NewCredentials(&stubProviderExpirer{ - stubProvider: stubProvider{ - creds: credentials.Value{ - AccessKeyID: "id", - SecretAccessKey: "secret", - SessionToken: "token", - ProviderName: "stubProvider", - }, - }, - }) - fakeClock := &fakes.FakeClock{} - fakeClock.NowReturns(time.Date(9999, 1, 1, 1, 1, 1, 1, time.UTC)) - p, err := newFileCacheProvider("profile", c, fakeClock, tmp) - Expect(err).NotTo(HaveOccurred()) - Expect(p.IsExpired()).To(BeTrue()) - }) - }) - When("the cache file already exists", func() { - It("will retrieve its content", func() { - content := []byte(`profiles: - profile: - credential: - accesskeyid: storedID - secretaccesskey: storedSecret - sessiontoken: storedToken - providername: stubProvider - expiration: 0001-01-01T00:00:00Z -`) - err := os.WriteFile(filepath.Join(tmp, "credentials.yaml"), content, 0700) - Expect(err).NotTo(HaveOccurred()) - c := credentials.NewCredentials(&stubProviderExpirer{}) - fakeClock := &fakes.FakeClock{} - p, err := newFileCacheProvider("profile", c, fakeClock, tmp) - Expect(err).NotTo(HaveOccurred()) - creds, err := p.Retrieve() - Expect(err).NotTo(HaveOccurred()) - Expect(creds.AccessKeyID).To(Equal("storedID")) - Expect(creds.SecretAccessKey).To(Equal("storedSecret")) - Expect(creds.SessionToken).To(Equal("storedToken")) - }) - }) - When("no underlying credentials have been supplied", func() { - It("returns an appropriate error", func() { - fakeClock := &fakes.FakeClock{} - _, err := newFileCacheProvider("profile", nil, fakeClock, tmp) - Expect(err).To(MatchError("no underlying Credentials object provided")) - }) - }) - When("the underlying credentials provider doesn't support caching", func() { - It("won't create a cache file", func() { - fakeClock := &fakes.FakeClock{} - fakeClock.NowReturns(time.Date(9999, 1, 1, 1, 1, 1, 1, time.UTC)) - p, err := newFileCacheProvider("profile", credentials.NewStaticCredentials("id", "secret", "token"), fakeClock, tmp) - Expect(err).NotTo(HaveOccurred()) - _, err = p.Retrieve() - Expect(err).NotTo(HaveOccurred()) - _, err = os.Stat(filepath.Join(tmp, "credentials.yaml")) - Expect(os.IsNotExist(err)).To(BeTrue()) - }) - - }) - When("the cache file's permission is too broad", func() { - It("will refuse to use that file", func() { - content := []byte(`test:`) - err := os.WriteFile(filepath.Join(tmp, "credentials.yaml"), content, 0777) - Expect(err).NotTo(HaveOccurred()) - c := credentials.NewCredentials(&stubProviderExpirer{}) - fakeClock := &fakes.FakeClock{} - _, err = newFileCacheProvider("profile", c, fakeClock, tmp) - Expect(err).To(MatchError(ContainSubstring(fmt.Sprintf("cache file %s is not private", filepath.Join(tmp, "credentials.yaml"))))) - }) - }) - When("the cache data has been corrupted", func() { - It("will return an appropriate error", func() { - content := []byte(`not valid yaml`) - err := os.WriteFile(filepath.Join(tmp, "credentials.yaml"), content, 0600) - Expect(err).NotTo(HaveOccurred()) - c := credentials.NewCredentials(&stubProviderExpirer{}) - fakeClock := &fakes.FakeClock{} - _, err = newFileCacheProvider("profile", c, fakeClock, tmp) - Expect(err).To(MatchError(ContainSubstring("unable to parse file"))) - }) - }) - }) -}) diff --git a/pkg/ctl/cmdutils/configfile.go b/pkg/ctl/cmdutils/configfile.go index 8a2ca680b2..89084c195e 100644 --- a/pkg/ctl/cmdutils/configfile.go +++ b/pkg/ctl/cmdutils/configfile.go @@ -306,6 +306,7 @@ func NewCreateClusterLoader(cmd *Cmd, ngFilter *filter.NodeGroupFilter, ng *api. l.validateWithoutConfigFile = func() error { meta := l.ClusterConfig.Metadata + meta.Region = cmd.ProviderConfig.Region // generate cluster name or use either flag or argument if names.ForCluster(meta.Name, l.NameArg) == "" { diff --git a/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go b/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go index 5ea70b6385..0f17648324 100644 --- a/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go +++ b/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go @@ -346,7 +346,7 @@ const expected = ` "metadata": { "name": "test-3x3-ngs", "region": "eu-central-1", - "version": "1.25" + "version": "1.27" }, "kubernetesNetworkConfig": { "ipFamily": "IPv4" diff --git a/pkg/ctl/cmdutils/scale.go b/pkg/ctl/cmdutils/scale.go index b351cd0db8..d7b68009cb 100644 --- a/pkg/ctl/cmdutils/scale.go +++ b/pkg/ctl/cmdutils/scale.go @@ -124,7 +124,7 @@ func ValidateNumberOfNodes(ng *api.NodeGroupBase) error { return nil } -//only 1 of desired/min/max has to be set on the cli +// only 1 of desired/min/max has to be set on the cli func validateNumberOfNodesCLI(ng *api.NodeGroupBase) error { if ng.ScalingConfig == nil { ng.ScalingConfig = &api.ScalingConfig{} diff --git a/pkg/ctl/cmdutils/update_cluster_vpc.go b/pkg/ctl/cmdutils/update_cluster_vpc.go new file mode 100644 index 0000000000..2539278af5 --- /dev/null +++ b/pkg/ctl/cmdutils/update_cluster_vpc.go @@ -0,0 +1,77 @@ +package cmdutils + +import ( + "errors" + + "github.com/kris-nova/logger" + + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" +) + +// UpdateClusterVPCOptions holds the options for updating the VPC config. +type UpdateClusterVPCOptions struct { + // PrivateAccess configures access for the private endpoint. + PrivateAccess bool + // PublicAccess configures access for the public endpoint. + PublicAccess bool + // PublicAccessCIDRs configures the public access CIDRs. + PublicAccessCIDRs []string +} + +// NewUpdateClusterVPCLoader will load config or use flags for 'eksctl utils update-cluster-vpc-config'. +func NewUpdateClusterVPCLoader(cmd *Cmd, options UpdateClusterVPCOptions) ClusterConfigLoader { + l := newCommonClusterConfigLoader(cmd) + + supportedOptions := []string{ + "private-access", + "public-access", + "public-access-cidrs", + } + + l.flagsIncompatibleWithConfigFile.Insert(supportedOptions...) + + l.validateWithoutConfigFile = func() error { + if err := l.validateMetadataWithoutConfigFile(); err != nil { + return err + } + hasRequiredOptions := false + for _, option := range supportedOptions { + if flag := l.CobraCommand.Flag(option); flag != nil && flag.Changed { + hasRequiredOptions = true + break + } + } + if !hasRequiredOptions { + return errors.New("at least one of --public-access, --private-access and --public-access-cidrs must be specified") + } + clusterConfig := cmd.ClusterConfig + + if clusterConfig.VPC.ClusterEndpoints == nil { + clusterConfig.VPC.ClusterEndpoints = api.ClusterEndpointAccessDefaults() + } + if flag := l.CobraCommand.Flag("private-access"); flag != nil && flag.Changed { + clusterConfig.VPC.ClusterEndpoints.PrivateAccess = &options.PrivateAccess + } else { + clusterConfig.VPC.ClusterEndpoints.PrivateAccess = nil + } + + if flag := l.CobraCommand.Flag("public-access"); flag != nil && flag.Changed { + clusterConfig.VPC.ClusterEndpoints.PublicAccess = &options.PublicAccess + } else { + clusterConfig.VPC.ClusterEndpoints.PublicAccess = nil + } + clusterConfig.VPC.PublicAccessCIDRs = options.PublicAccessCIDRs + return nil + } + + l.validateWithConfigFile = func() error { + logger.Info("only changes to vpc.clusterEndpoints and vpc.publicAccessCIDRs are updated in the EKS API, changes to any other fields will be ignored") + if l.ClusterConfig.VPC == nil { + l.ClusterConfig.VPC = api.NewClusterVPC(false) + } + api.SetClusterEndpointAccessDefaults(l.ClusterConfig.VPC) + return nil + } + + return l +} diff --git a/pkg/ctl/create/cluster.go b/pkg/ctl/create/cluster.go index 52b6f20bee..a7d4720920 100644 --- a/pkg/ctl/create/cluster.go +++ b/pkg/ctl/create/cluster.go @@ -32,7 +32,6 @@ import ( "github.com/weaveworks/eksctl/pkg/outposts" "github.com/weaveworks/eksctl/pkg/printers" "github.com/weaveworks/eksctl/pkg/utils/kubeconfig" - "github.com/weaveworks/eksctl/pkg/utils/kubectl" "github.com/weaveworks/eksctl/pkg/utils/names" "github.com/weaveworks/eksctl/pkg/utils/nodes" "github.com/weaveworks/eksctl/pkg/utils/tasks" @@ -289,7 +288,11 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params return err } - nodeGroupService := eks.NewNodeGroupService(ctl.AWSProvider, selector.New(ctl.AWSProvider.Session()), outpostsService) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + nodeGroupService := eks.NewNodeGroupService(ctl.AWSProvider, instanceSelector, outpostsService) nodePools := nodes.ToNodePools(cfg) if err := nodeGroupService.ExpandInstanceSelectorOptions(nodePools, cfg.AvailabilityZones); err != nil { return err @@ -459,11 +462,11 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params return nil } - env, err := ctl.GetCredentialsEnv() + env, err := ctl.GetCredentialsEnv(ctx) if err != nil { return err } - if err := kubectl.CheckAllCommands(params.KubeconfigPath, params.SetContext, kubeconfigContextName, env); err != nil { + if err := kubeconfig.CheckAllCommands(params.KubeconfigPath, params.SetContext, kubeconfigContextName, env); err != nil { logger.Critical("%s\n", err.Error()) logger.Info("cluster should be functional despite missing (or misconfigured) client binaries") } diff --git a/pkg/ctl/create/cluster_test.go b/pkg/ctl/create/cluster_test.go index 85a6d611a2..9a787acfe6 100644 --- a/pkg/ctl/create/cluster_test.go +++ b/pkg/ctl/create/cluster_test.go @@ -15,7 +15,6 @@ import ( ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" "github.com/aws/aws-sdk-go-v2/service/outposts" outpoststypes "github.com/aws/aws-sdk-go-v2/service/outposts/types" - "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/smithy-go" . "github.com/onsi/ginkgo/v2" @@ -34,6 +33,7 @@ import ( karpenteractions "github.com/weaveworks/eksctl/pkg/actions/karpenter" karpenterfakes "github.com/weaveworks/eksctl/pkg/actions/karpenter/fakes" "github.com/weaveworks/eksctl/pkg/cfn/manager" + "github.com/weaveworks/eksctl/pkg/cfn/waiter" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/outputs" @@ -250,14 +250,12 @@ var _ = Describe("create cluster", func() { ce.updateKubeProvider(fk) } - msp := &mockSessionProvider{} ctl := &eks.ClusterProvider{ AWSProvider: p, Status: &eks.ProviderStatus{ ClusterInfo: &eks.ClusterInfo{ Cluster: testutils.NewFakeCluster(clusterName, ""), }, - SessionCreds: msp, }, KubeProvider: fk, } @@ -939,9 +937,19 @@ func defaultProviderMocks(p *mockprovider.MockProvider, output []cftypes.Output, }, }, }, nil) + + waiter.ClusterCreationNextDelay = func(_ int) time.Duration { + return 0 + } p.MockCloudFormation().On("CreateStack", mock.Anything, mock.Anything).Return(&cloudformation.CreateStackOutput{ StackId: aws.String(clusterStackName), }, nil).Once() + + p.MockCredentialsProvider().On("Retrieve", mock.Anything).Return(aws.Credentials{ + AccessKeyID: "key-id", + SecretAccessKey: "secret-access-key", + SessionToken: "token", + }, nil) } func mockOutposts(provider *mockprovider.MockProvider, outpostID string) { @@ -979,15 +987,3 @@ func mockOutposts(provider *mockprovider.MockProvider, outpostID string) { }, }, nil) } - -type mockSessionProvider struct { -} - -func (m *mockSessionProvider) Get() (credentials.Value, error) { - return credentials.Value{ - AccessKeyID: "key-id", - SecretAccessKey: "secret-access-key", - SessionToken: "token", - ProviderName: "aws", - }, nil -} diff --git a/pkg/ctl/create/nodegroup.go b/pkg/ctl/create/nodegroup.go index 1ba4a57139..0922981bfa 100644 --- a/pkg/ctl/create/nodegroup.go +++ b/pkg/ctl/create/nodegroup.go @@ -67,7 +67,12 @@ func createNodeGroupCmd(cmd *cmdutils.Cmd) { return err } - manager := nodegroup.New(cmd.ClusterConfig, ctl, clientSet, selector.New(ctl.AWSProvider.Session())) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + + manager := nodegroup.New(cmd.ClusterConfig, ctl, clientSet, instanceSelector) return manager.Create(ctx, nodegroup.CreateOpts{ InstallNeuronDevicePlugin: options.InstallNeuronDevicePlugin, InstallNvidiaDevicePlugin: options.InstallNvidiaDevicePlugin, diff --git a/pkg/ctl/create/nodegroup_test.go b/pkg/ctl/create/nodegroup_test.go index d4dbb3035b..3b7678ba0f 100644 --- a/pkg/ctl/create/nodegroup_test.go +++ b/pkg/ctl/create/nodegroup_test.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/eks/types" - "github.com/aws/aws-sdk-go/aws" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/ctl/delete/nodegroup.go b/pkg/ctl/delete/nodegroup.go index 6edda5228c..1458a5698d 100644 --- a/pkg/ctl/delete/nodegroup.go +++ b/pkg/ctl/delete/nodegroup.go @@ -130,7 +130,11 @@ func doDeleteNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup, updateAuthConfigMap } allNodeGroups := cmdutils.ToKubeNodeGroups(cfg) - nodeGroupManager := nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + nodeGroupManager := nodegroup.New(cfg, ctl, clientSet, instanceSelector) if deleteNodeGroupDrain { cmdutils.LogIntendedAction(cmd.Plan, "drain %d nodegroup(s) in cluster %q", len(allNodeGroups), cfg.Metadata.Name) diff --git a/pkg/ctl/drain/nodegroup.go b/pkg/ctl/drain/nodegroup.go index 9f9f0d49a7..82191857db 100644 --- a/pkg/ctl/drain/nodegroup.go +++ b/pkg/ctl/drain/nodegroup.go @@ -142,5 +142,9 @@ func doDrainNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup, undo, onlyMissing bo DisableEviction: disableEviction, Parallel: parallel, } - return nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())).Drain(ctx, drainInput) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + return nodegroup.New(cfg, ctl, clientSet, instanceSelector).Drain(ctx, drainInput) } diff --git a/pkg/ctl/get/nodegroup.go b/pkg/ctl/get/nodegroup.go index 27e1542959..a203a70827 100644 --- a/pkg/ctl/get/nodegroup.go +++ b/pkg/ctl/get/nodegroup.go @@ -73,8 +73,13 @@ func doGetNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup, params *getCmdParams) return err } + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + var summaries []*nodegroup.Summary - manager := nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())) + manager := nodegroup.New(cfg, ctl, clientSet, instanceSelector) if ng.Name == "" { summaries, err = manager.GetAll(ctx) if err != nil { diff --git a/pkg/ctl/scale/nodegroup.go b/pkg/ctl/scale/nodegroup.go index f6aa78a275..1126480b57 100644 --- a/pkg/ctl/scale/nodegroup.go +++ b/pkg/ctl/scale/nodegroup.go @@ -99,5 +99,10 @@ func scaleNodegroup(cmd *cmdutils.Cmd, ng *api.NodeGroupBase) error { return err } - return nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())).Scale(ctx, ng, cmd.Wait) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + + return nodegroup.New(cfg, ctl, clientSet, instanceSelector).Scale(ctx, ng, cmd.Wait) } diff --git a/pkg/ctl/update/nodegroup.go b/pkg/ctl/update/nodegroup.go index 64ff36483d..e4e75f4a04 100644 --- a/pkg/ctl/update/nodegroup.go +++ b/pkg/ctl/update/nodegroup.go @@ -57,5 +57,9 @@ func updateNodegroup(cmd *cmdutils.Cmd) error { return err } - return nodegroup.New(cmd.ClusterConfig, ctl, nil, selector.New(ctl.AWSProvider.Session())).Update(ctx, cmd.Wait) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + return nodegroup.New(cmd.ClusterConfig, ctl, nil, instanceSelector).Update(ctx, cmd.Wait) } diff --git a/pkg/ctl/upgrade/nodegroup.go b/pkg/ctl/upgrade/nodegroup.go index 62551f4bb5..7bf566cf11 100644 --- a/pkg/ctl/upgrade/nodegroup.go +++ b/pkg/ctl/upgrade/nodegroup.go @@ -81,5 +81,9 @@ func upgradeNodeGroup(cmd *cmdutils.Cmd, options nodegroup.UpgradeOptions) error return err } - return nodegroup.New(cfg, ctl, clientSet, selector.New(ctl.AWSProvider.Session())).Upgrade(ctx, options) + instanceSelector, err := selector.New(ctx, ctl.AWSProvider.AWSConfig()) + if err != nil { + return err + } + return nodegroup.New(cfg, ctl, clientSet, instanceSelector).Upgrade(ctx, options) } diff --git a/pkg/ctl/utils/describe_stacks.go b/pkg/ctl/utils/describe_stacks.go index 96be7b7e46..0b6d86faff 100644 --- a/pkg/ctl/utils/describe_stacks.go +++ b/pkg/ctl/utils/describe_stacks.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "strings" "time" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" @@ -11,6 +12,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" + "golang.org/x/exp/slices" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" "github.com/weaveworks/eksctl/pkg/printers" @@ -23,6 +25,7 @@ func describeStacksCmd(cmd *cmdutils.Cmd) { cmd.ClusterConfig = cfg var all, events, trail bool + var resourceStatus []string var output printers.Type cmd.SetDescription("describe-stacks", "Describe CloudFormation stack for a given cluster", "") @@ -34,8 +37,9 @@ func describeStacksCmd(cmd *cmdutils.Cmd) { if output != "" { if cmd.CobraCommand.Flags().Changed("all") || cmd.CobraCommand.Flags().Changed("events") || - cmd.CobraCommand.Flags().Changed("trails") { - return errors.Errorf("since the output flag is specified, the flags `all`, `events` and `trail` cannot be used") + cmd.CobraCommand.Flags().Changed("trails") || + cmd.CobraCommand.Flags().Changed("resource-status") { + return errors.Errorf("since the output flag is specified, the flags `all`, `events`, `trail` and `resource-status` cannot be used") } } switch output { @@ -48,7 +52,7 @@ func describeStacksCmd(cmd *cmdutils.Cmd) { return err } } - return doDescribeStacksCmd(cmd, all, events, trail, printer) + return doDescribeStacksCmd(cmd, all, events, trail, resourceStatus, printer) } cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) { @@ -56,6 +60,7 @@ func describeStacksCmd(cmd *cmdutils.Cmd) { cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig) fs.BoolVar(&all, "all", false, "include deleted stacks") fs.BoolVar(&events, "events", false, "include stack events") + fs.StringSliceVar(&resourceStatus, "resource-status", nil, "resource statuses to filter events by, e.g. `CREATE_FAILED`, `UPDATE_FAILED`") fs.BoolVar(&trail, "trail", false, "lookup CloudTrail events for the cluster") fs.StringVarP(&output, "output", "o", "", "specifies the output formats (valid option: json and yaml)") cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile) @@ -65,7 +70,7 @@ func describeStacksCmd(cmd *cmdutils.Cmd) { cmdutils.AddCommonFlagsForAWS(cmd, &cmd.ProviderConfig, false) } -func doDescribeStacksCmd(cmd *cmdutils.Cmd, all, events, trail bool, printer printers.OutputPrinter) error { +func doDescribeStacksCmd(cmd *cmdutils.Cmd, all, events, trail bool, resourceStatus []string, printer printers.OutputPrinter) error { if err := cmdutils.NewMetadataLoader(cmd).Load(); err != nil { return err } @@ -93,6 +98,10 @@ func doDescribeStacksCmd(cmd *cmdutils.Cmd, all, events, trail bool, printer pri return cmdutils.ErrMustBeSet(cmdutils.ClusterNameFlag(cmd)) } + if len(resourceStatus) > 0 && !events { + return fmt.Errorf("--resource-status flag cannot be specified without setting --events=true") + } + stackManager := ctl.NewStackManager(cfg) stacks, err := stackManager.ListStacks(ctx) if err != nil { @@ -117,6 +126,21 @@ func doDescribeStacksCmd(cmd *cmdutils.Cmd, all, events, trail bool, printer pri if err != nil { logger.Critical(err.Error()) } + + if len(resourceStatus) > 0 { + for i, rs := range resourceStatus { + resourceStatus[i] = strings.ToLower(rs) + } + + filteredEvents := []types.StackEvent{} + for _, e := range events { + if slices.Contains(resourceStatus, strings.ToLower(string(e.ResourceStatus))) { + filteredEvents = append(filteredEvents, e) + } + } + events = filteredEvents + } + for i, e := range events { logger.Info("CloudFormation.events/%s[%d] = %s", *s.StackName, i, StackEventToString(&e)) } diff --git a/pkg/ctl/utils/mocks/VPCConfigUpdater.go b/pkg/ctl/utils/mocks/VPCConfigUpdater.go new file mode 100644 index 0000000000..1cd78980b4 --- /dev/null +++ b/pkg/ctl/utils/mocks/VPCConfigUpdater.go @@ -0,0 +1,43 @@ +// Code generated by mockery v2.32.4. DO NOT EDIT. + +package mocks + +import ( + context "context" + + eks "github.com/aws/aws-sdk-go-v2/service/eks" + mock "github.com/stretchr/testify/mock" +) + +// VPCConfigUpdater is an autogenerated mock type for the VPCConfigUpdater type +type VPCConfigUpdater struct { + mock.Mock +} + +// UpdateClusterConfig provides a mock function with given fields: ctx, input +func (_m *VPCConfigUpdater) UpdateClusterConfig(ctx context.Context, input *eks.UpdateClusterConfigInput) error { + ret := _m.Called(ctx, input) + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateClusterConfigInput) error); ok { + r0 = rf(ctx, input) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +// NewVPCConfigUpdater creates a new instance of VPCConfigUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewVPCConfigUpdater(t interface { + mock.TestingT + Cleanup(func()) +}) *VPCConfigUpdater { + mock := &VPCConfigUpdater{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/ctl/utils/nodegroup_health.go b/pkg/ctl/utils/nodegroup_health.go index c3c91a4ede..1328d685db 100644 --- a/pkg/ctl/utils/nodegroup_health.go +++ b/pkg/ctl/utils/nodegroup_health.go @@ -64,7 +64,7 @@ func getNodeGroupHealth(cmd *cmdutils.Cmd, nodeGroupName string) error { } if cfg.IsControlPlaneOnOutposts() { - return errUnsupportedLocalCluster + return api.ErrUnsupportedLocalCluster } stackCollection := manager.NewStackCollection(ctl.AWSProvider, cfg) managedService := managed.NewService(ctl.AWSProvider.EKS(), ctl.AWSProvider.EC2(), stackCollection, cfg.Metadata.Name) diff --git a/pkg/ctl/utils/set_public_access_cidrs.go b/pkg/ctl/utils/set_public_access_cidrs.go index 42f6babab7..bbd22d8665 100644 --- a/pkg/ctl/utils/set_public_access_cidrs.go +++ b/pkg/ctl/utils/set_public_access_cidrs.go @@ -4,10 +4,8 @@ import ( "context" "github.com/kris-nova/logger" - "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" - "k8s.io/apimachinery/pkg/util/sets" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" @@ -57,40 +55,12 @@ func doUpdatePublicAccessCIDRs(cmd *cmdutils.Cmd) error { return err } - clusterVPCConfig, err := ctl.GetCurrentClusterVPCConfig(ctx, cfg) - if err != nil { - return err - } - - if cfg.IsControlPlaneOnOutposts() { - return errUnsupportedLocalCluster - } - - logger.Info("current public access CIDRs: %v", clusterVPCConfig.PublicAccessCIDRs) - - if cidrsEqual(clusterVPCConfig.PublicAccessCIDRs, cfg.VPC.PublicAccessCIDRs) { - logger.Success("Public Endpoint Restrictions for cluster %q in %q is already up to date", - meta.Name, meta.Region) - return nil + cfg.VPC.ClusterEndpoints = nil + vpcHelper := &VPCHelper{ + VPCUpdater: ctl, + ClusterMeta: cfg.Metadata, + Cluster: ctl.Status.ClusterInfo.Cluster, + PlanMode: cmd.Plan, } - - cmdutils.LogIntendedAction( - cmd.Plan, "update Public Endpoint Restrictions for cluster %q in %q to: %v", - meta.Name, meta.Region, cfg.VPC.PublicAccessCIDRs) - - if !cmd.Plan { - if err := ctl.UpdatePublicAccessCIDRs(ctx, cfg); err != nil { - return errors.Wrap(err, "error updating CIDRs for public access") - } - cmdutils.LogCompletedAction( - false, - "Public Endpoint Restrictions for cluster %q in %q have been updated to: %v", - meta.Name, meta.Region, cfg.VPC.PublicAccessCIDRs) - } - cmdutils.LogPlanModeWarning(cmd.Plan) - return nil -} - -func cidrsEqual(currentValues, newValues []string) bool { - return sets.NewString(currentValues...).Equal(sets.NewString(newValues...)) + return vpcHelper.UpdateClusterVPCConfig(ctx, cfg.VPC) } diff --git a/pkg/ctl/utils/update_cluster_endpoint_access.go b/pkg/ctl/utils/update_cluster_endpoint_access.go index c9efa9d69d..39655bd5ae 100644 --- a/pkg/ctl/utils/update_cluster_endpoint_access.go +++ b/pkg/ctl/utils/update_cluster_endpoint_access.go @@ -11,17 +11,16 @@ import ( "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" ) -var ( - private bool - public bool -) - func updateClusterEndpointsCmd(cmd *cmdutils.Cmd) { cfg := api.NewClusterConfig() cmd.ClusterConfig = cfg cmd.SetDescription("update-cluster-endpoints", "Update Kubernetes API endpoint access configuration", "") + var ( + private bool + public bool + ) cmd.CobraCommand.RunE = func(_ *cobra.Command, _ []string) error { return doUpdateClusterEndpoints(cmd, private, public) } @@ -57,69 +56,17 @@ func doUpdateClusterEndpoints(cmd *cmdutils.Cmd, newPrivate bool, newPublic bool } logger.Info("using region %s", meta.Region) - if cfg.IsControlPlaneOnOutposts() { - return errUnsupportedLocalCluster - } - if ok, err := ctl.CanUpdate(cfg); !ok { return err } - clusterVPCConfig, err := ctl.GetCurrentClusterVPCConfig(ctx, cfg) - if err != nil { - return err - } - - curPrivate, curPublic := *clusterVPCConfig.ClusterEndpoints.PrivateAccess, *clusterVPCConfig.ClusterEndpoints.PublicAccess - - logger.Info("current Kubernetes API endpoint access: privateAccess=%v, publicAccess=%v", - curPrivate, curPublic) - - if cfg.VPC.ClusterEndpoints.PrivateAccess == nil { - newPrivate = curPrivate - } else { - newPrivate = *cfg.VPC.ClusterEndpoints.PrivateAccess - } - if cfg.VPC.ClusterEndpoints.PublicAccess == nil { - newPublic = curPublic - } else { - newPublic = *cfg.VPC.ClusterEndpoints.PublicAccess - } - - // Nothing changed? - if newPrivate == curPrivate && newPublic == curPublic { - logger.Success("Kubernetes API endpoint access for cluster %q in %q is already up to date", - meta.Name, meta.Region) - return nil - } - - cfg.VPC.ClusterEndpoints.PrivateAccess = &newPrivate - cfg.VPC.ClusterEndpoints.PublicAccess = &newPublic - - cmdutils.LogIntendedAction( - cmd.Plan, "update Kubernetes API endpoint access for cluster %q in %q to: privateAccess=%v, publicAccess=%v", - meta.Name, meta.Region, newPrivate, newPublic) - - if err := cfg.ValidateClusterEndpointConfig(); err != nil { - return err - } - - // if it's a private only cluster warn the user - if api.PrivateOnly(cfg.VPC.ClusterEndpoints) { - logger.Warning(api.ErrClusterEndpointPrivateOnly.Error()) - } - - if !cmd.Plan { - if err := ctl.UpdateClusterConfigForEndpoints(ctx, cfg); err != nil { - return err - } - cmdutils.LogCompletedAction( - false, - "the Kubernetes API endpoint access for cluster %q in %q has been updated to: "+ - "privateAccess=%v, publicAccess=%v", - meta.Name, meta.Region, newPrivate, newPublic) + cfg.VPC.PublicAccessCIDRs = nil + vpcHelper := &VPCHelper{ + VPCUpdater: ctl, + ClusterMeta: cfg.Metadata, + Cluster: ctl.Status.ClusterInfo.Cluster, + PlanMode: cmd.Plan, } - cmdutils.LogPlanModeWarning(cmd.Plan) - return nil + return vpcHelper.UpdateClusterVPCConfig(ctx, cfg.VPC) } diff --git a/pkg/ctl/utils/update_cluster_vpc_config.go b/pkg/ctl/utils/update_cluster_vpc_config.go new file mode 100644 index 0000000000..03334966c5 --- /dev/null +++ b/pkg/ctl/utils/update_cluster_vpc_config.go @@ -0,0 +1,78 @@ +package utils + +import ( + "context" + + "github.com/kris-nova/logger" + "github.com/lithammer/dedent" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" +) + +func updateClusterVPCConfigWithHandler(cmd *cmdutils.Cmd, handler func(cmd *cmdutils.Cmd) error) { + cfg := api.NewClusterConfig() + cmd.ClusterConfig = cfg + + cmd.SetDescription("update-cluster-vpc-config", "Update Kubernetes API endpoint access configuration and public access CIDRs", + dedent.Dedent(`Updates the Kubernetes API endpoint access configuration and public access CIDRs. + + When a config file is passed, only changes to vpc.clusterEndpoints and vpc.publicAccessCIDRs are updated in the EKS API. + Changes to any other fields are ignored. + `), + ) + var options cmdutils.UpdateClusterVPCOptions + cmd.CobraCommand.RunE = func(_ *cobra.Command, args []string) error { + cmd.NameArg = cmdutils.GetNameArg(args) + if err := cmdutils.NewUpdateClusterVPCLoader(cmd, options).Load(); err != nil { + return err + } + return handler(cmd) + } + + cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) { + cmdutils.AddClusterFlag(fs, cfg.Metadata) + cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig) + cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile) + cmdutils.AddApproveFlag(fs, cmd) + }) + + cmd.FlagSetGroup.InFlagSet("Endpoint Access", func(fs *pflag.FlagSet) { + fs.BoolVar(&options.PrivateAccess, "private-access", false, "access for private (VPC) clients") + fs.BoolVar(&options.PublicAccess, "public-access", false, "access for public clients") + }) + cmd.FlagSetGroup.InFlagSet("Public Access CIDRs", func(fs *pflag.FlagSet) { + fs.StringSliceVar(&options.PublicAccessCIDRs, "public-access-cidrs", nil, "CIDR blocks that EKS uses to create a security group on the public endpoint") + }) + + cmdutils.AddCommonFlagsForAWS(cmd, &cmd.ProviderConfig, false) +} + +func updateClusterVPCConfigCmd(cmd *cmdutils.Cmd) { + updateClusterVPCConfigWithHandler(cmd, doUpdateClusterVPCConfig) +} + +func doUpdateClusterVPCConfig(cmd *cmdutils.Cmd) error { + ctx := context.Background() + ctl, err := cmd.NewProviderForExistingCluster(ctx) + if err != nil { + return err + } + cfg := cmd.ClusterConfig + logger.Info("using region %s", cfg.Metadata.Region) + + if ok, err := ctl.CanUpdate(cfg); !ok { + return err + } + + vpcHelper := &VPCHelper{ + VPCUpdater: ctl, + ClusterMeta: cfg.Metadata, + Cluster: ctl.Status.ClusterInfo.Cluster, + PlanMode: cmd.Plan, + } + + return vpcHelper.UpdateClusterVPCConfig(ctx, cfg.VPC) +} diff --git a/pkg/ctl/utils/update_cluster_vpc_config_test.go b/pkg/ctl/utils/update_cluster_vpc_config_test.go new file mode 100644 index 0000000000..5a616a8115 --- /dev/null +++ b/pkg/ctl/utils/update_cluster_vpc_config_test.go @@ -0,0 +1,26 @@ +package utils + +import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +type updateClusterVPCEntry struct { + args []string + expectedErr string +} + +var _ = DescribeTable("invalid usage of update-cluster-vpc-config", func(e updateClusterVPCEntry) { + cmd := newMockCmd(append([]string{"update-cluster-vpc-config"}, e.args...)...) + _, err := cmd.execute() + Expect(err).To(MatchError(ContainSubstring(e.expectedErr))) +}, + Entry("missing --cluster option", updateClusterVPCEntry{ + expectedErr: "--cluster must be set", + }), + + Entry("missing a required parameter", updateClusterVPCEntry{ + args: []string{"--cluster", "test"}, + expectedErr: "at least one of --public-access, --private-access and --public-access-cidrs must be specified", + }), +) diff --git a/pkg/ctl/utils/utils.go b/pkg/ctl/utils/utils.go index df145d320f..764af2c896 100644 --- a/pkg/ctl/utils/utils.go +++ b/pkg/ctl/utils/utils.go @@ -1,15 +1,11 @@ package utils import ( - "errors" - "github.com/spf13/cobra" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" ) -var errUnsupportedLocalCluster = errors.New("this operation is not supported on local clusters") - // Command will create the `utils` commands func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command { verbCmd := cmdutils.NewVerbCmd("utils", "Various utils", "") @@ -25,6 +21,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command { cmdutils.AddResourceCmd(flagGrouping, verbCmd, installWindowsVPCController) cmdutils.AddResourceCmd(flagGrouping, verbCmd, updateClusterEndpointsCmd) cmdutils.AddResourceCmd(flagGrouping, verbCmd, publicAccessCIDRsCmd) + cmdutils.AddResourceCmd(flagGrouping, verbCmd, updateClusterVPCConfigCmd) cmdutils.AddResourceCmd(flagGrouping, verbCmd, enableSecretsEncryptionCmd) cmdutils.AddResourceCmd(flagGrouping, verbCmd, schemaCmd) cmdutils.AddResourceCmd(flagGrouping, verbCmd, nodeGroupHealthCmd) diff --git a/pkg/ctl/utils/vpc_helper.go b/pkg/ctl/utils/vpc_helper.go new file mode 100644 index 0000000000..bebf549d40 --- /dev/null +++ b/pkg/ctl/utils/vpc_helper.go @@ -0,0 +1,133 @@ +package utils + +import ( + "context" + "fmt" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/kris-nova/logger" + + "k8s.io/apimachinery/pkg/util/sets" + + "github.com/aws/aws-sdk-go-v2/service/eks" + ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" + + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" +) + +// A VPCConfigUpdater updates a cluster's VPC config. +type VPCConfigUpdater interface { + UpdateClusterConfig(ctx context.Context, input *eks.UpdateClusterConfigInput) error +} + +// A VPCHelper is a helper for updating a cluster's VPC config. +type VPCHelper struct { + // VPCUpdater updates the VPC config. + VPCUpdater VPCConfigUpdater + // ClusterMeta holds the cluster metadata. + ClusterMeta *api.ClusterMeta + // Cluster holds the current cluster state. + Cluster *ekstypes.Cluster + // PlanMode configures the plan mode. + PlanMode bool +} + +// UpdateClusterVPCConfig updates the cluster endpoints and public access CIDRs. +func (v *VPCHelper) UpdateClusterVPCConfig(ctx context.Context, vpc *api.ClusterVPC) error { + if v.Cluster.OutpostConfig != nil { + return api.ErrUnsupportedLocalCluster + } + if vpc.ClusterEndpoints != nil { + if err := v.updateEndpointAccess(ctx, *vpc.ClusterEndpoints); err != nil { + return err + } + } + if vpc.PublicAccessCIDRs != nil { + if err := v.updatePublicAccessCIDRs(ctx, vpc); err != nil { + return err + } + } + cmdutils.LogPlanModeWarning(v.PlanMode) + return nil +} + +func (v *VPCHelper) updateEndpointAccess(ctx context.Context, desired api.ClusterEndpoints) error { + current := v.Cluster.ResourcesVpcConfig + if desired.PublicAccess == nil { + desired.PublicAccess = aws.Bool(current.EndpointPublicAccess) + } + if desired.PrivateAccess == nil { + desired.PrivateAccess = aws.Bool(current.EndpointPrivateAccess) + } + if *desired.PublicAccess == current.EndpointPublicAccess && *desired.PrivateAccess == current.EndpointPrivateAccess { + logger.Success("Kubernetes API endpoint access for cluster %q in %q is already up-to-date", + v.ClusterMeta.Name, v.ClusterMeta.Region) + return nil + } + + cmdutils.LogIntendedAction( + v.PlanMode, "update Kubernetes API endpoint access for cluster %q in %q to: privateAccess=%v, publicAccess=%v", + v.ClusterMeta.Name, v.ClusterMeta.Region, *desired.PrivateAccess, *desired.PublicAccess) + if api.PrivateOnly(&desired) { + logger.Warning(api.ErrClusterEndpointPrivateOnly.Error()) + } + if v.PlanMode { + return nil + } + endpointUpdate := &ekstypes.VpcConfigRequest{ + EndpointPrivateAccess: desired.PrivateAccess, + EndpointPublicAccess: desired.PublicAccess, + } + if err := v.updateVPCConfig(ctx, endpointUpdate); err != nil { + return err + } + cmdutils.LogCompletedAction( + false, + "Kubernetes API endpoint access for cluster %q in %q has been updated to: "+ + "privateAccess=%v, publicAccess=%v", + v.ClusterMeta.Name, v.ClusterMeta.Region, *desired.PrivateAccess, *desired.PublicAccess) + return nil +} + +func (v *VPCHelper) updatePublicAccessCIDRs(ctx context.Context, vpc *api.ClusterVPC) error { + if cidrsEqual(v.Cluster.ResourcesVpcConfig.PublicAccessCidrs, vpc.PublicAccessCIDRs) { + logger.Success("public access CIDRs for cluster %q in %q are already up-to-date", + v.ClusterMeta.Name, v.ClusterMeta.Region) + return nil + } + + logger.Info("current public access CIDRs: %v", v.Cluster.ResourcesVpcConfig.PublicAccessCidrs) + cmdutils.LogIntendedAction( + v.PlanMode, "update public access CIDRs for cluster %q in %q to: %v", + v.ClusterMeta.Name, v.ClusterMeta.Region, vpc.PublicAccessCIDRs) + + if v.PlanMode { + return nil + } + + if err := v.updateVPCConfig(ctx, &ekstypes.VpcConfigRequest{ + PublicAccessCidrs: vpc.PublicAccessCIDRs, + }); err != nil { + return fmt.Errorf("error updating CIDRs for public access: %w", err) + } + cmdutils.LogCompletedAction( + false, + "public access CIDRs for cluster %q in %q have been updated to: %v", + v.ClusterMeta.Name, v.ClusterMeta.Region, vpc.PublicAccessCIDRs) + return nil +} + +func (v *VPCHelper) updateVPCConfig(ctx context.Context, vpcConfig *ekstypes.VpcConfigRequest) error { + return v.VPCUpdater.UpdateClusterConfig(ctx, &eks.UpdateClusterConfigInput{ + Name: v.Cluster.Name, + ResourcesVpcConfig: vpcConfig, + }) +} + +func cidrsEqual(currentValues, newValues []string) bool { + if len(newValues) == 0 && len(currentValues) == 1 && currentValues[0] == "0.0.0.0/0" { + return true + } + return sets.NewString(currentValues...).Equal(sets.NewString(newValues...)) +} diff --git a/pkg/ctl/utils/vpc_helper_test.go b/pkg/ctl/utils/vpc_helper_test.go new file mode 100644 index 0000000000..cd66052e7c --- /dev/null +++ b/pkg/ctl/utils/vpc_helper_test.go @@ -0,0 +1,200 @@ +package utils_test + +import ( + "context" + + "github.com/stretchr/testify/mock" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/eks" + ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + + "github.com/weaveworks/eksctl/pkg/ctl/utils/mocks" + + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + + "github.com/weaveworks/eksctl/pkg/ctl/utils" +) + +type vpcHelperEntry struct { + clusterVPC *ekstypes.VpcConfigResponse + vpc *api.ClusterVPC + outposts bool + planMode bool + + expectedUpdates []*eks.UpdateClusterConfigInput + expectedErr string +} + +var _ = DescribeTable("VPCHelper", func(e vpcHelperEntry) { + const updateClusterConfigMethodName = "UpdateClusterConfig" + var vpcUpdater mocks.VPCConfigUpdater + vpcUpdater.On(updateClusterConfigMethodName, mock.Anything, mock.Anything).Return(nil) + + clusterMeta := &api.ClusterMeta{ + Name: "test", + } + cluster := &ekstypes.Cluster{ + Name: aws.String(clusterMeta.Name), + ResourcesVpcConfig: e.clusterVPC, + } + if e.outposts { + cluster.OutpostConfig = &ekstypes.OutpostConfigResponse{ + OutpostArns: []string{"arn:aws:outposts:us-west-2:1234:outpost/op-1234"}, + } + } + vpcHelper := &utils.VPCHelper{ + VPCUpdater: &vpcUpdater, + ClusterMeta: clusterMeta, + Cluster: cluster, + PlanMode: e.planMode, + } + err := vpcHelper.UpdateClusterVPCConfig(context.Background(), e.vpc) + if e.expectedErr != "" { + Expect(err).To(MatchError(ContainSubstring(e.expectedErr))) + } else { + Expect(err).NotTo(HaveOccurred()) + } + vpcUpdater.AssertNumberOfCalls(GinkgoT(), updateClusterConfigMethodName, len(e.expectedUpdates)) + for _, u := range e.expectedUpdates { + vpcUpdater.AssertCalled(GinkgoT(), updateClusterConfigMethodName, mock.Anything, u) + } +}, + Entry("cluster matches default config", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{}, + }), + + Entry("cluster matches desired config", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{ + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: api.Enabled(), + PrivateAccess: api.Disabled(), + }, + }, + }), + + Entry("cluster endpoint access does not match desired config", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{ + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: api.Enabled(), + PrivateAccess: api.Enabled(), + }, + }, + + expectedUpdates: []*eks.UpdateClusterConfigInput{ + { + Name: aws.String("test"), + ResourcesVpcConfig: &ekstypes.VpcConfigRequest{ + EndpointPublicAccess: api.Enabled(), + EndpointPrivateAccess: api.Enabled(), + }, + }, + }, + }), + + Entry("cluster public access CIDRs do not match desired config", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{ + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: api.Enabled(), + PrivateAccess: api.Disabled(), + }, + PublicAccessCIDRs: []string{"1.1.1.1/32", "2.2.2.2/32"}, + }, + + expectedUpdates: []*eks.UpdateClusterConfigInput{ + { + Name: aws.String("test"), + ResourcesVpcConfig: &ekstypes.VpcConfigRequest{ + PublicAccessCidrs: []string{"1.1.1.1/32", "2.2.2.2/32"}, + }, + }, + }, + }), + + Entry("both cluster endpoint access and public access CIDRs do not match desired config", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{ + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: api.Disabled(), + PrivateAccess: api.Enabled(), + }, + PublicAccessCIDRs: []string{"1.1.1.1/32", "2.2.2.2/32"}, + }, + + expectedUpdates: []*eks.UpdateClusterConfigInput{ + { + Name: aws.String("test"), + ResourcesVpcConfig: &ekstypes.VpcConfigRequest{ + EndpointPublicAccess: api.Disabled(), + EndpointPrivateAccess: api.Enabled(), + }, + }, + { + Name: aws.String("test"), + ResourcesVpcConfig: &ekstypes.VpcConfigRequest{ + PublicAccessCidrs: []string{"1.1.1.1/32", "2.2.2.2/32"}, + }, + }, + }, + }), + + Entry("cluster does not match desired config but in plan mode", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{ + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: api.Disabled(), + PrivateAccess: api.Enabled(), + }, + PublicAccessCIDRs: []string{"1.1.1.1/32", "2.2.2.2/32"}, + }, + planMode: true, + }), + + Entry("updating an Outpost cluster fails", vpcHelperEntry{ + clusterVPC: &ekstypes.VpcConfigResponse{ + EndpointPublicAccess: true, + EndpointPrivateAccess: false, + PublicAccessCidrs: []string{"0.0.0.0/0"}, + }, + vpc: &api.ClusterVPC{ + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: api.Disabled(), + PrivateAccess: api.Enabled(), + }, + PublicAccessCIDRs: []string{"1.1.1.1/32", "2.2.2.2/32"}, + }, + outposts: true, + + expectedErr: "this operation is not supported on Outposts clusters", + }), +) diff --git a/pkg/eks/api.go b/pkg/eks/api.go index a2c5830682..24aeeb8588 100644 --- a/pkg/eks/api.go +++ b/pkg/eks/api.go @@ -11,7 +11,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" awsv2 "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/credentials/stscreds" "github.com/aws/aws-sdk-go-v2/service/autoscaling" "github.com/aws/aws-sdk-go-v2/service/cloudtrail" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" @@ -19,16 +18,8 @@ import ( ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" "github.com/aws/aws-sdk-go-v2/service/sts" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/client" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/endpoints" - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/gofrs/flock" "github.com/kris-nova/logger" "github.com/pkg/errors" - "github.com/spf13/afero" "k8s.io/apimachinery/pkg/runtime" k8sclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" @@ -39,11 +30,10 @@ import ( "github.com/weaveworks/eksctl/pkg/awsapi" "github.com/weaveworks/eksctl/pkg/az" "github.com/weaveworks/eksctl/pkg/cfn/manager" - ekscreds "github.com/weaveworks/eksctl/pkg/credentials" + "github.com/weaveworks/eksctl/pkg/credentials" "github.com/weaveworks/eksctl/pkg/kubernetes" "github.com/weaveworks/eksctl/pkg/utils/kubeconfig" "github.com/weaveworks/eksctl/pkg/utils/nodes" - "github.com/weaveworks/eksctl/pkg/version" ) // ClusterProvider stores information about the cluster @@ -81,7 +71,6 @@ type ProviderServices struct { cloudtrail awsapi.CloudTrail cloudwatchlogs awsapi.CloudWatchLogs - session *session.Session *ServicesV2 } @@ -114,78 +103,95 @@ func (p ProviderServices) Profile() api.Profile { return p.spec.Profile } // WaitTimeout returns provider-level duration after which any wait operation has to timeout func (p ProviderServices) WaitTimeout() time.Duration { return p.spec.WaitTimeout } -func (p ProviderServices) ConfigProvider() client.ConfigProvider { - return p.session -} - -func (p ProviderServices) Session() *session.Session { - return p.session -} - // ClusterInfo provides information about the cluster. type ClusterInfo struct { Cluster *ekstypes.Cluster } -// SessionProvider abstracts an aws credentials.Value provider. -type SessionProvider interface { - Get() (credentials.Value, error) -} - // ProviderStatus stores information about the used IAM role and the resulting session type ProviderStatus struct { - IAMRoleARN string - ClusterInfo *ClusterInfo - SessionCreds SessionProvider + IAMRoleARN string + ClusterInfo *ClusterInfo } // New creates a new setup of the used AWS APIs -func New(ctx context.Context, spec *api.ProviderConfig, clusterSpec *api.ClusterConfig) (*ClusterProvider, error) { - provider := &ProviderServices{ - spec: spec, +func New( + ctx context.Context, + spec *api.ProviderConfig, + clusterSpec *api.ClusterConfig, +) (*ClusterProvider, error) { + return newHelper(ctx, spec, clusterSpec, newAWSProvider) +} + +func newHelper( + ctx context.Context, + spec *api.ProviderConfig, + clusterSpec *api.ClusterConfig, + awsProviderBuilder func(*api.ProviderConfig, AWSConfigurationLoader) (api.ClusterProvider, error), +) (*ClusterProvider, error) { + provider, err := awsProviderBuilder(spec, &ConfigurationLoader{}) + if err != nil { + return nil, err } + c := &ClusterProvider{ AWSProvider: provider, + Status: &ProviderStatus{}, + } + + stsOutput, err := c.checkAuth(ctx) + if err != nil { + return nil, err + } + + // c.Status.IAMRoleARN is later needed by the kubeProvider + c.Status.IAMRoleARN = *stsOutput.Arn + logger.Debug("role ARN for the current session is %q", c.Status.IAMRoleARN) + + if clusterSpec != nil { + clusterSpec.Metadata.AccountID = *stsOutput.Account + clusterSpec.Metadata.Region = c.AWSProvider.Region() + } + + kubeProvider := &KubernetesProvider{ + WaitTimeout: spec.WaitTimeout, + RoleARN: c.Status.IAMRoleARN, + Signer: provider.STSPresigner(), } - // Create a new session and save credentials for possible - // later re-use if overriding sessions due to custom URL - s := c.newSession(spec) + c.KubeProvider = kubeProvider - cacheCredentials := os.Getenv(ekscreds.EksctlGlobalEnableCachingEnvName) != "" + return c, nil +} + +func newAWSProvider(spec *api.ProviderConfig, configurationLoader AWSConfigurationLoader) (api.ClusterProvider, error) { var ( credentialsCacheFilePath string err error ) + + provider := &ProviderServices{ + spec: spec, + } + + cacheCredentials := os.Getenv(credentials.EksctlGlobalEnableCachingEnvName) != "" if cacheCredentials { - if s.Config == nil { - return nil, errors.New("expected Session.Config to be non-nil") - } - credentialsCacheFilePath, err = ekscreds.GetCacheFilePath() + credentialsCacheFilePath, err = credentials.GetCacheFilePath() if err != nil { return nil, fmt.Errorf("error getting cache file path: %w", err) } - if cachedProvider, err := ekscreds.NewFileCacheProvider(spec.Profile.Name, s.Config.Credentials, &ekscreds.RealClock{}, afero.NewOsFs(), func(path string) ekscreds.Flock { - return flock.New(path) - }, credentialsCacheFilePath); err == nil { - s.Config.Credentials = credentials.NewCredentials(&cachedProvider) - } else { - logger.Warning("Failed to use cached provider: ", err) - } } - provider.session = s - - cfg, err := newV2Config(spec, c.AWSProvider.Region(), credentialsCacheFilePath) + cfg, err := newV2Config(spec, credentialsCacheFilePath, configurationLoader) if err != nil { return nil, err } - provider.ServicesV2 = &ServicesV2{ - config: cfg, + if spec.Region == "" { + spec.Region = cfg.Region } - c.Status = &ProviderStatus{ - SessionCreds: s.Config.Credentials, + provider.ServicesV2 = &ServicesV2{ + config: cfg, } provider.asg = autoscaling.NewFromConfig(cfg) @@ -195,32 +201,11 @@ func New(ctx context.Context, spec *api.ProviderConfig, clusterSpec *api.Cluster if endpoint, ok := os.LookupEnv("AWS_CLOUDTRAIL_ENDPOINT"); ok { logger.Debug("Setting CloudTrail endpoint to %s", endpoint) provider.cloudtrail = cloudtrail.NewFromConfig(cfg, func(o *cloudtrail.Options) { - o.EndpointResolver = cloudtrail.EndpointResolverFromURL(endpoint) + o.BaseEndpoint = &endpoint }) } - stsOutput, err := c.checkAuth(ctx) - if err != nil { - return nil, err - } - - // c.Status.IAMRoleARN is later needed by the kubeProvider - c.Status.IAMRoleARN = *stsOutput.Arn - logger.Debug("role ARN for the current session is %q", c.Status.IAMRoleARN) - - if clusterSpec != nil { - clusterSpec.Metadata.AccountID = *stsOutput.Account - clusterSpec.Metadata.Region = c.AWSProvider.Region() - } - - kubeProvider := &KubernetesProvider{ - WaitTimeout: spec.WaitTimeout, - RoleARN: c.Status.IAMRoleARN, - Signer: provider.STSPresigner(), - } - c.KubeProvider = kubeProvider - - return c, nil + return provider, nil } // ParseConfig parses data into a ClusterConfig @@ -278,8 +263,8 @@ func (c *ClusterProvider) IsSupportedRegion() bool { } // GetCredentialsEnv returns the AWS credentials for env usage -func (c *ClusterProvider) GetCredentialsEnv() ([]string, error) { - creds, err := c.Status.SessionCreds.Get() +func (c *ClusterProvider) GetCredentialsEnv(ctx context.Context) ([]string, error) { + creds, err := c.AWSProvider.CredentialsProvider().Retrieve(ctx) if err != nil { return nil, errors.Wrap(err, "getting effective credentials") } @@ -485,61 +470,6 @@ func ValidateLocalZones(ctx context.Context, ec2API awsapi.EC2, localZones []str return nil } -func (c *ClusterProvider) newSession(spec *api.ProviderConfig) *session.Session { - // we might want to use bits from kops, although right now it seems like too many things we - // don't want yet - // https://github.com/kubernetes/kops/blob/master/upup/pkg/fi/cloudup/awsup/aws_cloud.go#L179 - config := aws.NewConfig().WithCredentialsChainVerboseErrors(true) - - if c.AWSProvider.Region() != "" { - config = config.WithRegion(c.AWSProvider.Region()).WithSTSRegionalEndpoint(endpoints.RegionalSTSEndpoint) - } - - config = request.WithRetryer(config, newLoggingRetryer()) - if logger.Level >= api.AWSDebugLevel { - config = config.WithLogLevel(aws.LogDebug | - aws.LogDebugWithHTTPBody | - aws.LogDebugWithRequestRetries | - aws.LogDebugWithRequestErrors | - aws.LogDebugWithEventStreamBody) - config = config.WithLogger(aws.LoggerFunc(func(args ...interface{}) { - logger.Debug(fmt.Sprintln(args...)) - })) - } - - // Create the options for the session - opts := session.Options{ - Config: *config, - SharedConfigState: session.SharedConfigEnable, - Profile: spec.Profile.Name, - AssumeRoleTokenProvider: stscreds.StdinTokenProvider, - } - - stscreds.DefaultDuration = 30 * time.Minute - - s := session.Must(session.NewSessionWithOptions(opts)) - - s.Handlers.Build.PushFrontNamed(request.NamedHandler{ - Name: "eksctlUserAgent", - Fn: request.MakeAddToUserAgentHandler( - "eksctl", version.String()), - }) - - if spec.Region == "" { - if api.IsSetAndNonEmptyString(s.Config.Region) { - // set cluster config region, based on session config - spec.Region = *s.Config.Region - } else { - // if session config doesn't have region set, make recursive call forcing default region - logger.Debug("no region specified in flags or config, setting to %s", api.DefaultRegion) - spec.Region = api.DefaultRegion - return c.newSession(spec) - } - } - - return s -} - // NewStackManager returns a new stack manager func (c *ClusterProvider) NewStackManager(spec *api.ClusterConfig) manager.StackManager { return manager.NewStackCollection(c.AWSProvider, spec) diff --git a/pkg/eks/api_test.go b/pkg/eks/api_test.go index 861dfdce5e..e477ecc1e7 100644 --- a/pkg/eks/api_test.go +++ b/pkg/eks/api_test.go @@ -3,25 +3,180 @@ package eks_test import ( "context" "fmt" + "os" + "time" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/ec2" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/aws/aws-sdk-go-v2/service/ssm" ssmtypes "github.com/aws/aws-sdk-go-v2/service/ssm/types" + "github.com/aws/aws-sdk-go-v2/service/sts" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" gomegatypes "github.com/onsi/gomega/types" "github.com/stretchr/testify/mock" - api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + "github.com/weaveworks/eksctl/pkg/credentials" "github.com/weaveworks/eksctl/pkg/eks" . "github.com/weaveworks/eksctl/pkg/eks" + "github.com/weaveworks/eksctl/pkg/eks/fakes" "github.com/weaveworks/eksctl/pkg/testutils/mockprovider" ) +const ( + genericError = "generic error" + cacheFilePath = "testdata/cached-credentials.yaml" +) + +type newAWSProviderEntry struct { + updateFakes func(*fakes.FakeAWSConfigurationLoader) + updateEnv func() func() + err string +} + +type newClusterProviderEntry struct { + updateMocks func(*mockprovider.MockProvider) + overwriteAWSProviderBuilderMock func(pc *api.ProviderConfig, acl AWSConfigurationLoader) (api.ClusterProvider, error) + err string +} + var _ = Describe("eksctl API", func() { + DescribeTable("creating the AWS provider", func(e newAWSProviderEntry) { + fakeConfigurationLoader := fakes.FakeAWSConfigurationLoader{} + fakeConfigurationLoader.LoadDefaultConfigReturns(aws.Config{ + Region: api.DefaultRegion, + }, nil) + if e.updateFakes != nil { + e.updateFakes(&fakeConfigurationLoader) + } + + if e.updateEnv != nil { + resetEnv := e.updateEnv() + defer resetEnv() + } + + awsProvider, err := eks.NewAWSProvider(&api.ProviderConfig{}, &fakeConfigurationLoader) + if e.err != "" { + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring(e.err)) + return + } + Expect(err).NotTo(HaveOccurred()) + + // check that all provider services were or can be (lazily) initialized properly + Expect(awsProvider.CloudFormation()).NotTo(BeNil()) + Expect(awsProvider.ASG()).NotTo(BeNil()) + Expect(awsProvider.EKS()).NotTo(BeNil()) + Expect(awsProvider.SSM()).NotTo(BeNil()) + Expect(awsProvider.CloudTrail()).NotTo(BeNil()) + Expect(awsProvider.CloudWatchLogs()).NotTo(BeNil()) + Expect(awsProvider.IAM()).NotTo(BeNil()) + Expect(awsProvider.ELB()).NotTo(BeNil()) + Expect(awsProvider.ELBV2()).NotTo(BeNil()) + Expect(awsProvider.STS()).NotTo(BeNil()) + Expect(awsProvider.STSPresigner()).NotTo(BeNil()) + Expect(awsProvider.EC2()).NotTo(BeNil()) + Expect(awsProvider.Outposts()).NotTo(BeNil()) + + // check that region was setup properly + Expect(awsProvider.Region()).To(Equal(api.DefaultRegion)) + + // check that load config options were setup properly + _, options := fakeConfigurationLoader.LoadDefaultConfigArgsForCall(0) + lo := &config.LoadOptions{} + for _, loadOptionsFunc := range options { + Expect(loadOptionsFunc(lo)).NotTo(HaveOccurred()) + } + + // check that credentials cache was setup properly + cco := &aws.CredentialsCacheOptions{} + lo.CredentialsCacheOptions(cco) + Expect(cco.ExpiryWindow).To(Equal(30 * time.Minute)) + Expect(cco.ExpiryWindowJitterFrac).To(Equal(float64(0))) + }, + Entry("fails to load default config", newAWSProviderEntry{ + updateFakes: func(fal *fakes.FakeAWSConfigurationLoader) { + fal.LoadDefaultConfigReturns(*aws.NewConfig(), fmt.Errorf(genericError)) + }, + err: genericError, + }), + Entry("cached credentials file has wrong permissions", newAWSProviderEntry{ + updateEnv: func() func() { + info, err := os.Stat(cacheFilePath) + Expect(err).NotTo(HaveOccurred()) + Expect(os.Chmod(cacheFilePath, 0777)).NotTo(HaveOccurred()) + Expect(os.Setenv(credentials.EksctlGlobalEnableCachingEnvName, "1")).NotTo(HaveOccurred()) + Expect(os.Setenv(credentials.EksctlCacheFilenameEnvName, cacheFilePath)).NotTo(HaveOccurred()) + return func() { + Expect(os.Chmod(cacheFilePath, info.Mode())).NotTo(HaveOccurred()) + Expect(os.Unsetenv(credentials.EksctlGlobalEnableCachingEnvName)).NotTo(HaveOccurred()) + Expect(os.Unsetenv(credentials.EksctlCacheFilenameEnvName)).NotTo(HaveOccurred()) + } + }, + err: fmt.Sprintf("cache file %s is not private", cacheFilePath), + }), + Entry("creates the AWS provider successfully", newAWSProviderEntry{}), + ) + + DescribeTable("creating the EKS provider", func(e newClusterProviderEntry) { + clusterConfig := api.NewClusterConfig() + clusterConfig.Metadata = &api.ClusterMeta{} + + mockProvider := mockprovider.NewMockProvider() + mockProvider.MockSTS().On("GetCallerIdentity", mock.Anything, mock.Anything).Return( + &sts.GetCallerIdentityOutput{ + Account: aws.String("accountId"), + Arn: aws.String("arn"), + }, + nil, + ).Once() + if e.updateMocks != nil { + e.updateMocks(mockProvider) + } + + awsProviderBuilderMock := func(pc *api.ProviderConfig, acl AWSConfigurationLoader) (api.ClusterProvider, error) { + return mockProvider, nil + } + if e.overwriteAWSProviderBuilderMock != nil { + awsProviderBuilderMock = e.overwriteAWSProviderBuilderMock + } + + clusterProvider, err := eks.NewHelper(context.Background(), &api.ProviderConfig{}, clusterConfig, awsProviderBuilderMock) + if e.err != "" { + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring(e.err)) + return + } + Expect(err).NotTo(HaveOccurred()) + + // check that cluster config was setup properly + Expect(clusterConfig.Metadata.AccountID).To(Equal("accountId")) + Expect(clusterConfig.Metadata.Region).To(Equal(api.DefaultRegion)) + + // check that kube provider was setup properly + Expect(clusterProvider.KubeProvider).NotTo(BeNil()) + }, + Entry("fails to create the AWS provider", newClusterProviderEntry{ + overwriteAWSProviderBuilderMock: func(pc *api.ProviderConfig, acl AWSConfigurationLoader) (api.ClusterProvider, error) { + return nil, fmt.Errorf(genericError) + }, + err: genericError, + }), + Entry("fails to validate auth", newClusterProviderEntry{ + updateMocks: func(mp *mockprovider.MockProvider) { + _, _ = mp.STS().GetCallerIdentity(context.Background(), nil) + mp.MockSTS().On("GetCallerIdentity", mock.Anything, mock.Anything).Return( + nil, fmt.Errorf(genericError), + ).Once() + }, + err: fmt.Sprintf("checking AWS STS access – cannot get role ARN for current session: %s", genericError), + }), + Entry("creates the EKS provider successfully", newClusterProviderEntry{}), + ) + Context("loading config files", func() { BeforeEach(func() { diff --git a/pkg/eks/apiv2.go b/pkg/eks/apiv2.go index dac4123968..ba82e89958 100644 --- a/pkg/eks/apiv2.go +++ b/pkg/eks/apiv2.go @@ -28,12 +28,25 @@ import ( "github.com/weaveworks/eksctl/pkg/version" ) -func newV2Config(pc *api.ProviderConfig, region string, credentialsCacheFilePath string) (aws.Config, error) { +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//counterfeiter:generate -o fakes/fake_configuration_loader.go . AWSConfigurationLoader +type AWSConfigurationLoader interface { + LoadDefaultConfig(ctx context.Context, optFns ...func(*config.LoadOptions) error) (cfg aws.Config, err error) +} + +type ConfigurationLoader struct { + AWSConfigurationLoader +} + +func (cl ConfigurationLoader) LoadDefaultConfig(ctx context.Context, optFns ...func(*config.LoadOptions) error) (aws.Config, error) { + return config.LoadDefaultConfig(ctx, optFns...) +} + +func newV2Config(pc *api.ProviderConfig, credentialsCacheFilePath string, configurationLoader AWSConfigurationLoader) (aws.Config, error) { var options []func(options *config.LoadOptions) error - // TODO default region - if region != "" { - options = append(options, config.WithRegion(region)) + if pc.Region != "" { + options = append(options, config.WithRegion(pc.Region)) } clientLogMode := aws.ClientLogMode(1) @@ -50,7 +63,7 @@ func newV2Config(pc *api.ProviderConfig, region string, credentialsCacheFilePath options = append(options, config.WithSharedConfigProfile(pc.Profile.Name)) } - cfg, err := config.LoadDefaultConfig(context.TODO(), append(options, + cfg, err := configurationLoader.LoadDefaultConfig(context.TODO(), append(options, config.WithRetryer(func() aws.Retryer { return NewRetryerV2() }), @@ -61,13 +74,21 @@ func newV2Config(pc *api.ProviderConfig, region string, credentialsCacheFilePath config.WithAPIOptions([]func(stack *middleware.Stack) error{ middlewarev2.AddUserAgentKeyValue("eksctl", version.String()), }), + // Some CloudFormation operations can take a long time to complete, and we + // don't want any temporary credentials to expire before this occurs. So if + // it's less than 30 minutes before the current credentials will expire, try + // to renew them first. + config.WithCredentialsCacheOptions(func(o *aws.CredentialsCacheOptions) { + logger.Debug("Setting credentials expiry window to 30 minutes") + o.ExpiryWindow = 30 * time.Minute + o.ExpiryWindowJitterFrac = 0 + }), )...) if err != nil { return cfg, err } if credentialsCacheFilePath != "" { - // TODO: extract the underlying CredentialsProvider from cfg.Credentials and use it. fileCache, err := credentials.NewFileCacheV2(cfg.Credentials, pc.Profile.Name, afero.NewOsFs(), func(path string) credentials.Flock { return flock.New(path) }, &credentials.RealClock{}, credentialsCacheFilePath) diff --git a/pkg/eks/eks.go b/pkg/eks/eks.go index 08f62c828a..46c6b398d8 100644 --- a/pkg/eks/eks.go +++ b/pkg/eks/eks.go @@ -170,9 +170,7 @@ func (c *ClusterProvider) NewOpenIDConnectManager(ctx context.Context, spec *api if err != nil { return nil, errors.Wrapf(err, "unexpected invalid ARN: %q", spec.Status.ARN) } - switch parsedARN.Partition { - case "aws", "aws-cn", "aws-us-gov": - default: + if !api.Partitions.IsSupported(parsedARN.Partition) { return nil, fmt.Errorf("unknown EKS ARN: %q", spec.Status.ARN) } diff --git a/pkg/eks/export_test.go b/pkg/eks/export_test.go new file mode 100644 index 0000000000..73d9d37615 --- /dev/null +++ b/pkg/eks/export_test.go @@ -0,0 +1,6 @@ +package eks + +var ( + NewHelper = newHelper + NewAWSProvider = newAWSProvider +) diff --git a/pkg/eks/fakes/fake_configuration_loader.go b/pkg/eks/fakes/fake_configuration_loader.go new file mode 100644 index 0000000000..961b79715c --- /dev/null +++ b/pkg/eks/fakes/fake_configuration_loader.go @@ -0,0 +1,121 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package fakes + +import ( + "context" + "sync" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/config" + "github.com/weaveworks/eksctl/pkg/eks" +) + +type FakeAWSConfigurationLoader struct { + LoadDefaultConfigStub func(context.Context, ...func(*config.LoadOptions) error) (aws.Config, error) + loadDefaultConfigMutex sync.RWMutex + loadDefaultConfigArgsForCall []struct { + arg1 context.Context + arg2 []func(*config.LoadOptions) error + } + loadDefaultConfigReturns struct { + result1 aws.Config + result2 error + } + loadDefaultConfigReturnsOnCall map[int]struct { + result1 aws.Config + result2 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeAWSConfigurationLoader) LoadDefaultConfig(arg1 context.Context, arg2 ...func(*config.LoadOptions) error) (aws.Config, error) { + fake.loadDefaultConfigMutex.Lock() + ret, specificReturn := fake.loadDefaultConfigReturnsOnCall[len(fake.loadDefaultConfigArgsForCall)] + fake.loadDefaultConfigArgsForCall = append(fake.loadDefaultConfigArgsForCall, struct { + arg1 context.Context + arg2 []func(*config.LoadOptions) error + }{arg1, arg2}) + stub := fake.LoadDefaultConfigStub + fakeReturns := fake.loadDefaultConfigReturns + fake.recordInvocation("LoadDefaultConfig", []interface{}{arg1, arg2}) + fake.loadDefaultConfigMutex.Unlock() + if stub != nil { + return stub(arg1, arg2...) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeAWSConfigurationLoader) LoadDefaultConfigCallCount() int { + fake.loadDefaultConfigMutex.RLock() + defer fake.loadDefaultConfigMutex.RUnlock() + return len(fake.loadDefaultConfigArgsForCall) +} + +func (fake *FakeAWSConfigurationLoader) LoadDefaultConfigCalls(stub func(context.Context, ...func(*config.LoadOptions) error) (aws.Config, error)) { + fake.loadDefaultConfigMutex.Lock() + defer fake.loadDefaultConfigMutex.Unlock() + fake.LoadDefaultConfigStub = stub +} + +func (fake *FakeAWSConfigurationLoader) LoadDefaultConfigArgsForCall(i int) (context.Context, []func(*config.LoadOptions) error) { + fake.loadDefaultConfigMutex.RLock() + defer fake.loadDefaultConfigMutex.RUnlock() + argsForCall := fake.loadDefaultConfigArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeAWSConfigurationLoader) LoadDefaultConfigReturns(result1 aws.Config, result2 error) { + fake.loadDefaultConfigMutex.Lock() + defer fake.loadDefaultConfigMutex.Unlock() + fake.LoadDefaultConfigStub = nil + fake.loadDefaultConfigReturns = struct { + result1 aws.Config + result2 error + }{result1, result2} +} + +func (fake *FakeAWSConfigurationLoader) LoadDefaultConfigReturnsOnCall(i int, result1 aws.Config, result2 error) { + fake.loadDefaultConfigMutex.Lock() + defer fake.loadDefaultConfigMutex.Unlock() + fake.LoadDefaultConfigStub = nil + if fake.loadDefaultConfigReturnsOnCall == nil { + fake.loadDefaultConfigReturnsOnCall = make(map[int]struct { + result1 aws.Config + result2 error + }) + } + fake.loadDefaultConfigReturnsOnCall[i] = struct { + result1 aws.Config + result2 error + }{result1, result2} +} + +func (fake *FakeAWSConfigurationLoader) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.loadDefaultConfigMutex.RLock() + defer fake.loadDefaultConfigMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeAWSConfigurationLoader) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ eks.AWSConfigurationLoader = new(FakeAWSConfigurationLoader) diff --git a/pkg/eks/fakes/fake_instance_selector.go b/pkg/eks/fakes/fake_instance_selector.go index e14cc934b1..c0fa903bb8 100644 --- a/pkg/eks/fakes/fake_instance_selector.go +++ b/pkg/eks/fakes/fake_instance_selector.go @@ -2,6 +2,7 @@ package fakes import ( + "context" "sync" "github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector" @@ -9,10 +10,11 @@ import ( ) type FakeInstanceSelector struct { - FilterStub func(selector.Filters) ([]string, error) + FilterStub func(context.Context, selector.Filters) ([]string, error) filterMutex sync.RWMutex filterArgsForCall []struct { - arg1 selector.Filters + arg1 context.Context + arg2 selector.Filters } filterReturns struct { result1 []string @@ -26,18 +28,19 @@ type FakeInstanceSelector struct { invocationsMutex sync.RWMutex } -func (fake *FakeInstanceSelector) Filter(arg1 selector.Filters) ([]string, error) { +func (fake *FakeInstanceSelector) Filter(arg1 context.Context, arg2 selector.Filters) ([]string, error) { fake.filterMutex.Lock() ret, specificReturn := fake.filterReturnsOnCall[len(fake.filterArgsForCall)] fake.filterArgsForCall = append(fake.filterArgsForCall, struct { - arg1 selector.Filters - }{arg1}) + arg1 context.Context + arg2 selector.Filters + }{arg1, arg2}) stub := fake.FilterStub fakeReturns := fake.filterReturns - fake.recordInvocation("Filter", []interface{}{arg1}) + fake.recordInvocation("Filter", []interface{}{arg1, arg2}) fake.filterMutex.Unlock() if stub != nil { - return stub(arg1) + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 @@ -51,17 +54,17 @@ func (fake *FakeInstanceSelector) FilterCallCount() int { return len(fake.filterArgsForCall) } -func (fake *FakeInstanceSelector) FilterCalls(stub func(selector.Filters) ([]string, error)) { +func (fake *FakeInstanceSelector) FilterCalls(stub func(context.Context, selector.Filters) ([]string, error)) { fake.filterMutex.Lock() defer fake.filterMutex.Unlock() fake.FilterStub = stub } -func (fake *FakeInstanceSelector) FilterArgsForCall(i int) selector.Filters { +func (fake *FakeInstanceSelector) FilterArgsForCall(i int) (context.Context, selector.Filters) { fake.filterMutex.RLock() defer fake.filterMutex.RUnlock() argsForCall := fake.filterArgsForCall[i] - return argsForCall.arg1 + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeInstanceSelector) FilterReturns(result1 []string, result2 error) { diff --git a/pkg/eks/fargate.go b/pkg/eks/fargate.go index 1a9da6430c..d9f809ec94 100644 --- a/pkg/eks/fargate.go +++ b/pkg/eks/fargate.go @@ -18,7 +18,6 @@ import ( api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate //counterfeiter:generate -o fakes/fargate_client.go . FargateClient type FargateClient interface { CreateProfile(ctx context.Context, profile *api.FargateProfile, waitForCreation bool) error diff --git a/pkg/eks/instance_selector_test.go b/pkg/eks/instance_selector_test.go index e899ba2efa..1cf684c623 100644 --- a/pkg/eks/instance_selector_test.go +++ b/pkg/eks/instance_selector_test.go @@ -45,7 +45,8 @@ var _ = Describe("Instance Selector", func() { Expect(instanceSelectorFake.FilterCallCount()).To(Equal(len(isc.nodeGroups))) for i := range isc.nodeGroups { - Expect(*instanceSelectorFake.FilterArgsForCall(i).AvailabilityZones).To(Equal(isc.expectedAZs)) + _, arg := instanceSelectorFake.FilterArgsForCall(i) + Expect(*arg.AvailabilityZones).To(Equal(isc.expectedAZs)) } Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/eks/logging_retryer.go b/pkg/eks/logging_retryer.go deleted file mode 100644 index 8edd05db7e..0000000000 --- a/pkg/eks/logging_retryer.go +++ /dev/null @@ -1,98 +0,0 @@ -/* -Copyright 2016 The Kubernetes 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. -*/ - -package eks - -import ( - "fmt" - "time" - - "github.com/aws/aws-sdk-go/service/cloudformation" - "github.com/kris-nova/logger" - - "github.com/aws/aws-sdk-go/aws/client" - "github.com/aws/aws-sdk-go/aws/request" -) - -const ( - maxRetries = 13 - cfnMinThrottleDelay = 5 * time.Second -) - -// LoggingRetryer adds some logging when we are retrying, so we have some idea what is happening -// Right now it is very basic - e.g. it only logs when we retry (so doesn't log when we fail due to too many retries) -// It was copied from k8s.io/kops/upup/pkg/fi/cloudup/awsup/logging_retryer.go; the original version used glog, and -// didn't export the constructor -type LoggingRetryer struct { - client.DefaultRetryer - cfnRetryer client.DefaultRetryer -} - -var _ request.Retryer = &LoggingRetryer{} - -func newLoggingRetryer() *LoggingRetryer { - return &LoggingRetryer{ - DefaultRetryer: client.DefaultRetryer{ - NumMaxRetries: maxRetries, - }, - cfnRetryer: client.DefaultRetryer{ - NumMaxRetries: maxRetries, - MinThrottleDelay: cfnMinThrottleDelay, - }, - } -} - -// ShouldRetry uses DefaultRetryer.ShouldRetry but also checks for non-retryable -// EC2MetadataError (see #2564) -func (l LoggingRetryer) ShouldRetry(r *request.Request) bool { - shouldRetry := l.DefaultRetryer.ShouldRetry(r) - if !shouldRetry { - return false - } - return isErrorRetryable(r.Error) -} - -// RetryRules extends on DefaultRetryer.RetryRules -func (l LoggingRetryer) RetryRules(r *request.Request) time.Duration { - var ( - duration time.Duration - service = r.ClientInfo.ServiceName - ) - - if r.IsErrorThrottle() && service == cloudformation.ServiceName && r.Operation.Name == "DescribeStacks" { - duration = l.cfnRetryer.RetryRules(r) - } else { - duration = l.DefaultRetryer.RetryRules(r) - } - - name := "?" - if r.Operation != nil { - name = r.Operation.Name - } - methodDescription := service + "/" + name - - var errorDescription string - if r.Error != nil { - // We could check aws error Code & Message, but we expect them to be in the string - errorDescription = fmt.Sprintf("%v", r.Error) - } else { - errorDescription = fmt.Sprintf("%d %s", r.HTTPResponse.StatusCode, r.HTTPResponse.Status) - } - - logger.Warning("retryable error (%s) from %s - will retry after delay of %v", errorDescription, methodDescription, duration) - - return duration -} diff --git a/pkg/eks/mocks/ConfigProvider.go b/pkg/eks/mocks/ConfigProvider.go index 9b5ec5572d..5e809b75b7 100644 --- a/pkg/eks/mocks/ConfigProvider.go +++ b/pkg/eks/mocks/ConfigProvider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocks @@ -34,3 +34,17 @@ func (_m *ConfigProvider) ClientConfig(serviceName string, cfgs ...*aws.Config) return r0 } + +// NewConfigProvider creates a new instance of ConfigProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewConfigProvider(t interface { + mock.TestingT + Cleanup(func()) +}) *ConfigProvider { + mock := &ConfigProvider{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocks/KubeNodeGroup.go b/pkg/eks/mocks/KubeNodeGroup.go index 49e2ea4f2b..38f1266e8d 100644 --- a/pkg/eks/mocks/KubeNodeGroup.go +++ b/pkg/eks/mocks/KubeNodeGroup.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocks @@ -67,3 +67,17 @@ func (_m *KubeNodeGroup) Size() int { return r0 } + +// NewKubeNodeGroup creates a new instance of KubeNodeGroup. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewKubeNodeGroup(t interface { + mock.TestingT + Cleanup(func()) +}) *KubeNodeGroup { + mock := &KubeNodeGroup{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocks/mocks.go b/pkg/eks/mocks/mocks.go deleted file mode 100644 index 0655c41bd8..0000000000 --- a/pkg/eks/mocks/mocks.go +++ /dev/null @@ -1,8 +0,0 @@ -package mocks - -import ( - _ "github.com/vektra/mockery" -) - -// Run make check-all-generated-files-up-to-date to generate the mocks -//go:generate "${GOBIN}/mockery" --tags netgo --dir=${AWS_SDK_GO_DIR}/aws/client --name=ConfigProvider --output=./ diff --git a/pkg/eks/mocksv2/ASG.go b/pkg/eks/mocksv2/ASG.go index f4c501bea3..a349b2c35c 100644 --- a/pkg/eks/mocksv2/ASG.go +++ b/pkg/eks/mocksv2/ASG.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -27,6 +27,10 @@ func (_m *ASG) AttachInstances(ctx context.Context, params *autoscaling.AttachIn ret := _m.Called(_ca...) var r0 *autoscaling.AttachInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachInstancesInput, ...func(*autoscaling.Options)) (*autoscaling.AttachInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachInstancesInput, ...func(*autoscaling.Options)) *autoscaling.AttachInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -35,7 +39,6 @@ func (_m *ASG) AttachInstances(ctx context.Context, params *autoscaling.AttachIn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.AttachInstancesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -57,6 +60,10 @@ func (_m *ASG) AttachLoadBalancerTargetGroups(ctx context.Context, params *autos ret := _m.Called(_ca...) var r0 *autoscaling.AttachLoadBalancerTargetGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) (*autoscaling.AttachLoadBalancerTargetGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) *autoscaling.AttachLoadBalancerTargetGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -65,7 +72,6 @@ func (_m *ASG) AttachLoadBalancerTargetGroups(ctx context.Context, params *autos } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.AttachLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -87,6 +93,10 @@ func (_m *ASG) AttachLoadBalancers(ctx context.Context, params *autoscaling.Atta ret := _m.Called(_ca...) var r0 *autoscaling.AttachLoadBalancersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachLoadBalancersInput, ...func(*autoscaling.Options)) (*autoscaling.AttachLoadBalancersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachLoadBalancersInput, ...func(*autoscaling.Options)) *autoscaling.AttachLoadBalancersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -95,7 +105,6 @@ func (_m *ASG) AttachLoadBalancers(ctx context.Context, params *autoscaling.Atta } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.AttachLoadBalancersInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -117,6 +126,10 @@ func (_m *ASG) AttachTrafficSources(ctx context.Context, params *autoscaling.Att ret := _m.Called(_ca...) var r0 *autoscaling.AttachTrafficSourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachTrafficSourcesInput, ...func(*autoscaling.Options)) (*autoscaling.AttachTrafficSourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.AttachTrafficSourcesInput, ...func(*autoscaling.Options)) *autoscaling.AttachTrafficSourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -125,7 +138,6 @@ func (_m *ASG) AttachTrafficSources(ctx context.Context, params *autoscaling.Att } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.AttachTrafficSourcesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -147,6 +159,10 @@ func (_m *ASG) BatchDeleteScheduledAction(ctx context.Context, params *autoscali ret := _m.Called(_ca...) var r0 *autoscaling.BatchDeleteScheduledActionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.BatchDeleteScheduledActionInput, ...func(*autoscaling.Options)) (*autoscaling.BatchDeleteScheduledActionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.BatchDeleteScheduledActionInput, ...func(*autoscaling.Options)) *autoscaling.BatchDeleteScheduledActionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -155,7 +171,6 @@ func (_m *ASG) BatchDeleteScheduledAction(ctx context.Context, params *autoscali } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.BatchDeleteScheduledActionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -177,6 +192,10 @@ func (_m *ASG) BatchPutScheduledUpdateGroupAction(ctx context.Context, params *a ret := _m.Called(_ca...) var r0 *autoscaling.BatchPutScheduledUpdateGroupActionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.BatchPutScheduledUpdateGroupActionInput, ...func(*autoscaling.Options)) (*autoscaling.BatchPutScheduledUpdateGroupActionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.BatchPutScheduledUpdateGroupActionInput, ...func(*autoscaling.Options)) *autoscaling.BatchPutScheduledUpdateGroupActionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -185,7 +204,6 @@ func (_m *ASG) BatchPutScheduledUpdateGroupAction(ctx context.Context, params *a } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.BatchPutScheduledUpdateGroupActionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -207,6 +225,10 @@ func (_m *ASG) CancelInstanceRefresh(ctx context.Context, params *autoscaling.Ca ret := _m.Called(_ca...) var r0 *autoscaling.CancelInstanceRefreshOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CancelInstanceRefreshInput, ...func(*autoscaling.Options)) (*autoscaling.CancelInstanceRefreshOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CancelInstanceRefreshInput, ...func(*autoscaling.Options)) *autoscaling.CancelInstanceRefreshOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -215,7 +237,6 @@ func (_m *ASG) CancelInstanceRefresh(ctx context.Context, params *autoscaling.Ca } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.CancelInstanceRefreshInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -237,6 +258,10 @@ func (_m *ASG) CompleteLifecycleAction(ctx context.Context, params *autoscaling. ret := _m.Called(_ca...) var r0 *autoscaling.CompleteLifecycleActionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CompleteLifecycleActionInput, ...func(*autoscaling.Options)) (*autoscaling.CompleteLifecycleActionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CompleteLifecycleActionInput, ...func(*autoscaling.Options)) *autoscaling.CompleteLifecycleActionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -245,7 +270,6 @@ func (_m *ASG) CompleteLifecycleAction(ctx context.Context, params *autoscaling. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.CompleteLifecycleActionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -267,6 +291,10 @@ func (_m *ASG) CreateAutoScalingGroup(ctx context.Context, params *autoscaling.C ret := _m.Called(_ca...) var r0 *autoscaling.CreateAutoScalingGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CreateAutoScalingGroupInput, ...func(*autoscaling.Options)) (*autoscaling.CreateAutoScalingGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CreateAutoScalingGroupInput, ...func(*autoscaling.Options)) *autoscaling.CreateAutoScalingGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -275,7 +303,6 @@ func (_m *ASG) CreateAutoScalingGroup(ctx context.Context, params *autoscaling.C } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.CreateAutoScalingGroupInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -297,6 +324,10 @@ func (_m *ASG) CreateLaunchConfiguration(ctx context.Context, params *autoscalin ret := _m.Called(_ca...) var r0 *autoscaling.CreateLaunchConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CreateLaunchConfigurationInput, ...func(*autoscaling.Options)) (*autoscaling.CreateLaunchConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CreateLaunchConfigurationInput, ...func(*autoscaling.Options)) *autoscaling.CreateLaunchConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -305,7 +336,6 @@ func (_m *ASG) CreateLaunchConfiguration(ctx context.Context, params *autoscalin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.CreateLaunchConfigurationInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -327,6 +357,10 @@ func (_m *ASG) CreateOrUpdateTags(ctx context.Context, params *autoscaling.Creat ret := _m.Called(_ca...) var r0 *autoscaling.CreateOrUpdateTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CreateOrUpdateTagsInput, ...func(*autoscaling.Options)) (*autoscaling.CreateOrUpdateTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.CreateOrUpdateTagsInput, ...func(*autoscaling.Options)) *autoscaling.CreateOrUpdateTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -335,7 +369,6 @@ func (_m *ASG) CreateOrUpdateTags(ctx context.Context, params *autoscaling.Creat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.CreateOrUpdateTagsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -357,6 +390,10 @@ func (_m *ASG) DeleteAutoScalingGroup(ctx context.Context, params *autoscaling.D ret := _m.Called(_ca...) var r0 *autoscaling.DeleteAutoScalingGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteAutoScalingGroupInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteAutoScalingGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteAutoScalingGroupInput, ...func(*autoscaling.Options)) *autoscaling.DeleteAutoScalingGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -365,7 +402,6 @@ func (_m *ASG) DeleteAutoScalingGroup(ctx context.Context, params *autoscaling.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteAutoScalingGroupInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -387,6 +423,10 @@ func (_m *ASG) DeleteLaunchConfiguration(ctx context.Context, params *autoscalin ret := _m.Called(_ca...) var r0 *autoscaling.DeleteLaunchConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteLaunchConfigurationInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteLaunchConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteLaunchConfigurationInput, ...func(*autoscaling.Options)) *autoscaling.DeleteLaunchConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -395,7 +435,6 @@ func (_m *ASG) DeleteLaunchConfiguration(ctx context.Context, params *autoscalin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteLaunchConfigurationInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -417,6 +456,10 @@ func (_m *ASG) DeleteLifecycleHook(ctx context.Context, params *autoscaling.Dele ret := _m.Called(_ca...) var r0 *autoscaling.DeleteLifecycleHookOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteLifecycleHookInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteLifecycleHookOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteLifecycleHookInput, ...func(*autoscaling.Options)) *autoscaling.DeleteLifecycleHookOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -425,7 +468,6 @@ func (_m *ASG) DeleteLifecycleHook(ctx context.Context, params *autoscaling.Dele } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteLifecycleHookInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -447,6 +489,10 @@ func (_m *ASG) DeleteNotificationConfiguration(ctx context.Context, params *auto ret := _m.Called(_ca...) var r0 *autoscaling.DeleteNotificationConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteNotificationConfigurationInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteNotificationConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteNotificationConfigurationInput, ...func(*autoscaling.Options)) *autoscaling.DeleteNotificationConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -455,7 +501,6 @@ func (_m *ASG) DeleteNotificationConfiguration(ctx context.Context, params *auto } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteNotificationConfigurationInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -477,6 +522,10 @@ func (_m *ASG) DeletePolicy(ctx context.Context, params *autoscaling.DeletePolic ret := _m.Called(_ca...) var r0 *autoscaling.DeletePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeletePolicyInput, ...func(*autoscaling.Options)) (*autoscaling.DeletePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeletePolicyInput, ...func(*autoscaling.Options)) *autoscaling.DeletePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -485,7 +534,6 @@ func (_m *ASG) DeletePolicy(ctx context.Context, params *autoscaling.DeletePolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeletePolicyInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -507,6 +555,10 @@ func (_m *ASG) DeleteScheduledAction(ctx context.Context, params *autoscaling.De ret := _m.Called(_ca...) var r0 *autoscaling.DeleteScheduledActionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteScheduledActionInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteScheduledActionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteScheduledActionInput, ...func(*autoscaling.Options)) *autoscaling.DeleteScheduledActionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -515,7 +567,6 @@ func (_m *ASG) DeleteScheduledAction(ctx context.Context, params *autoscaling.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteScheduledActionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -537,6 +588,10 @@ func (_m *ASG) DeleteTags(ctx context.Context, params *autoscaling.DeleteTagsInp ret := _m.Called(_ca...) var r0 *autoscaling.DeleteTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteTagsInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteTagsInput, ...func(*autoscaling.Options)) *autoscaling.DeleteTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -545,7 +600,6 @@ func (_m *ASG) DeleteTags(ctx context.Context, params *autoscaling.DeleteTagsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteTagsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -567,6 +621,10 @@ func (_m *ASG) DeleteWarmPool(ctx context.Context, params *autoscaling.DeleteWar ret := _m.Called(_ca...) var r0 *autoscaling.DeleteWarmPoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteWarmPoolInput, ...func(*autoscaling.Options)) (*autoscaling.DeleteWarmPoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DeleteWarmPoolInput, ...func(*autoscaling.Options)) *autoscaling.DeleteWarmPoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -575,7 +633,6 @@ func (_m *ASG) DeleteWarmPool(ctx context.Context, params *autoscaling.DeleteWar } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DeleteWarmPoolInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -597,6 +654,10 @@ func (_m *ASG) DescribeAccountLimits(ctx context.Context, params *autoscaling.De ret := _m.Called(_ca...) var r0 *autoscaling.DescribeAccountLimitsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAccountLimitsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeAccountLimitsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAccountLimitsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeAccountLimitsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -605,7 +666,6 @@ func (_m *ASG) DescribeAccountLimits(ctx context.Context, params *autoscaling.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeAccountLimitsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -627,6 +687,10 @@ func (_m *ASG) DescribeAdjustmentTypes(ctx context.Context, params *autoscaling. ret := _m.Called(_ca...) var r0 *autoscaling.DescribeAdjustmentTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAdjustmentTypesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeAdjustmentTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAdjustmentTypesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeAdjustmentTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -635,7 +699,6 @@ func (_m *ASG) DescribeAdjustmentTypes(ctx context.Context, params *autoscaling. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeAdjustmentTypesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -657,6 +720,10 @@ func (_m *ASG) DescribeAutoScalingGroups(ctx context.Context, params *autoscalin ret := _m.Called(_ca...) var r0 *autoscaling.DescribeAutoScalingGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAutoScalingGroupsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeAutoScalingGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAutoScalingGroupsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeAutoScalingGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -665,7 +732,6 @@ func (_m *ASG) DescribeAutoScalingGroups(ctx context.Context, params *autoscalin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeAutoScalingGroupsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -687,6 +753,10 @@ func (_m *ASG) DescribeAutoScalingInstances(ctx context.Context, params *autosca ret := _m.Called(_ca...) var r0 *autoscaling.DescribeAutoScalingInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAutoScalingInstancesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeAutoScalingInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAutoScalingInstancesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeAutoScalingInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -695,7 +765,6 @@ func (_m *ASG) DescribeAutoScalingInstances(ctx context.Context, params *autosca } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeAutoScalingInstancesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -717,6 +786,10 @@ func (_m *ASG) DescribeAutoScalingNotificationTypes(ctx context.Context, params ret := _m.Called(_ca...) var r0 *autoscaling.DescribeAutoScalingNotificationTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAutoScalingNotificationTypesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeAutoScalingNotificationTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeAutoScalingNotificationTypesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeAutoScalingNotificationTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -725,7 +798,6 @@ func (_m *ASG) DescribeAutoScalingNotificationTypes(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeAutoScalingNotificationTypesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -747,6 +819,10 @@ func (_m *ASG) DescribeInstanceRefreshes(ctx context.Context, params *autoscalin ret := _m.Called(_ca...) var r0 *autoscaling.DescribeInstanceRefreshesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeInstanceRefreshesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeInstanceRefreshesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeInstanceRefreshesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeInstanceRefreshesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -755,7 +831,6 @@ func (_m *ASG) DescribeInstanceRefreshes(ctx context.Context, params *autoscalin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeInstanceRefreshesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -777,6 +852,10 @@ func (_m *ASG) DescribeLaunchConfigurations(ctx context.Context, params *autosca ret := _m.Called(_ca...) var r0 *autoscaling.DescribeLaunchConfigurationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLaunchConfigurationsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeLaunchConfigurationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLaunchConfigurationsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeLaunchConfigurationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -785,7 +864,6 @@ func (_m *ASG) DescribeLaunchConfigurations(ctx context.Context, params *autosca } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeLaunchConfigurationsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -807,6 +885,10 @@ func (_m *ASG) DescribeLifecycleHookTypes(ctx context.Context, params *autoscali ret := _m.Called(_ca...) var r0 *autoscaling.DescribeLifecycleHookTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLifecycleHookTypesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeLifecycleHookTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLifecycleHookTypesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeLifecycleHookTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -815,7 +897,6 @@ func (_m *ASG) DescribeLifecycleHookTypes(ctx context.Context, params *autoscali } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeLifecycleHookTypesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -837,6 +918,10 @@ func (_m *ASG) DescribeLifecycleHooks(ctx context.Context, params *autoscaling.D ret := _m.Called(_ca...) var r0 *autoscaling.DescribeLifecycleHooksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLifecycleHooksInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeLifecycleHooksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLifecycleHooksInput, ...func(*autoscaling.Options)) *autoscaling.DescribeLifecycleHooksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -845,7 +930,6 @@ func (_m *ASG) DescribeLifecycleHooks(ctx context.Context, params *autoscaling.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeLifecycleHooksInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -867,6 +951,10 @@ func (_m *ASG) DescribeLoadBalancerTargetGroups(ctx context.Context, params *aut ret := _m.Called(_ca...) var r0 *autoscaling.DescribeLoadBalancerTargetGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeLoadBalancerTargetGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeLoadBalancerTargetGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -875,7 +963,6 @@ func (_m *ASG) DescribeLoadBalancerTargetGroups(ctx context.Context, params *aut } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -897,6 +984,10 @@ func (_m *ASG) DescribeLoadBalancers(ctx context.Context, params *autoscaling.De ret := _m.Called(_ca...) var r0 *autoscaling.DescribeLoadBalancersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLoadBalancersInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeLoadBalancersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeLoadBalancersInput, ...func(*autoscaling.Options)) *autoscaling.DescribeLoadBalancersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -905,7 +996,6 @@ func (_m *ASG) DescribeLoadBalancers(ctx context.Context, params *autoscaling.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeLoadBalancersInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -927,6 +1017,10 @@ func (_m *ASG) DescribeMetricCollectionTypes(ctx context.Context, params *autosc ret := _m.Called(_ca...) var r0 *autoscaling.DescribeMetricCollectionTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeMetricCollectionTypesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeMetricCollectionTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeMetricCollectionTypesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeMetricCollectionTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -935,7 +1029,6 @@ func (_m *ASG) DescribeMetricCollectionTypes(ctx context.Context, params *autosc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeMetricCollectionTypesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -957,6 +1050,10 @@ func (_m *ASG) DescribeNotificationConfigurations(ctx context.Context, params *a ret := _m.Called(_ca...) var r0 *autoscaling.DescribeNotificationConfigurationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeNotificationConfigurationsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeNotificationConfigurationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeNotificationConfigurationsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeNotificationConfigurationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -965,7 +1062,6 @@ func (_m *ASG) DescribeNotificationConfigurations(ctx context.Context, params *a } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeNotificationConfigurationsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -987,6 +1083,10 @@ func (_m *ASG) DescribePolicies(ctx context.Context, params *autoscaling.Describ ret := _m.Called(_ca...) var r0 *autoscaling.DescribePoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribePoliciesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribePoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribePoliciesInput, ...func(*autoscaling.Options)) *autoscaling.DescribePoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -995,7 +1095,6 @@ func (_m *ASG) DescribePolicies(ctx context.Context, params *autoscaling.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribePoliciesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1017,6 +1116,10 @@ func (_m *ASG) DescribeScalingActivities(ctx context.Context, params *autoscalin ret := _m.Called(_ca...) var r0 *autoscaling.DescribeScalingActivitiesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeScalingActivitiesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeScalingActivitiesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeScalingActivitiesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeScalingActivitiesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1025,7 +1128,6 @@ func (_m *ASG) DescribeScalingActivities(ctx context.Context, params *autoscalin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeScalingActivitiesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1047,6 +1149,10 @@ func (_m *ASG) DescribeScalingProcessTypes(ctx context.Context, params *autoscal ret := _m.Called(_ca...) var r0 *autoscaling.DescribeScalingProcessTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeScalingProcessTypesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeScalingProcessTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeScalingProcessTypesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeScalingProcessTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1055,7 +1161,6 @@ func (_m *ASG) DescribeScalingProcessTypes(ctx context.Context, params *autoscal } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeScalingProcessTypesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1077,6 +1182,10 @@ func (_m *ASG) DescribeScheduledActions(ctx context.Context, params *autoscaling ret := _m.Called(_ca...) var r0 *autoscaling.DescribeScheduledActionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeScheduledActionsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeScheduledActionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeScheduledActionsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeScheduledActionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1085,7 +1194,6 @@ func (_m *ASG) DescribeScheduledActions(ctx context.Context, params *autoscaling } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeScheduledActionsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1107,6 +1215,10 @@ func (_m *ASG) DescribeTags(ctx context.Context, params *autoscaling.DescribeTag ret := _m.Called(_ca...) var r0 *autoscaling.DescribeTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeTagsInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeTagsInput, ...func(*autoscaling.Options)) *autoscaling.DescribeTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1115,7 +1227,6 @@ func (_m *ASG) DescribeTags(ctx context.Context, params *autoscaling.DescribeTag } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeTagsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1137,6 +1248,10 @@ func (_m *ASG) DescribeTerminationPolicyTypes(ctx context.Context, params *autos ret := _m.Called(_ca...) var r0 *autoscaling.DescribeTerminationPolicyTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeTerminationPolicyTypesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeTerminationPolicyTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeTerminationPolicyTypesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeTerminationPolicyTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1145,7 +1260,6 @@ func (_m *ASG) DescribeTerminationPolicyTypes(ctx context.Context, params *autos } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeTerminationPolicyTypesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1167,6 +1281,10 @@ func (_m *ASG) DescribeTrafficSources(ctx context.Context, params *autoscaling.D ret := _m.Called(_ca...) var r0 *autoscaling.DescribeTrafficSourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeTrafficSourcesInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeTrafficSourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeTrafficSourcesInput, ...func(*autoscaling.Options)) *autoscaling.DescribeTrafficSourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1175,7 +1293,6 @@ func (_m *ASG) DescribeTrafficSources(ctx context.Context, params *autoscaling.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeTrafficSourcesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1197,6 +1314,10 @@ func (_m *ASG) DescribeWarmPool(ctx context.Context, params *autoscaling.Describ ret := _m.Called(_ca...) var r0 *autoscaling.DescribeWarmPoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeWarmPoolInput, ...func(*autoscaling.Options)) (*autoscaling.DescribeWarmPoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DescribeWarmPoolInput, ...func(*autoscaling.Options)) *autoscaling.DescribeWarmPoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1205,7 +1326,6 @@ func (_m *ASG) DescribeWarmPool(ctx context.Context, params *autoscaling.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DescribeWarmPoolInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1227,6 +1347,10 @@ func (_m *ASG) DetachInstances(ctx context.Context, params *autoscaling.DetachIn ret := _m.Called(_ca...) var r0 *autoscaling.DetachInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachInstancesInput, ...func(*autoscaling.Options)) (*autoscaling.DetachInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachInstancesInput, ...func(*autoscaling.Options)) *autoscaling.DetachInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1235,7 +1359,6 @@ func (_m *ASG) DetachInstances(ctx context.Context, params *autoscaling.DetachIn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DetachInstancesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1257,6 +1380,10 @@ func (_m *ASG) DetachLoadBalancerTargetGroups(ctx context.Context, params *autos ret := _m.Called(_ca...) var r0 *autoscaling.DetachLoadBalancerTargetGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) (*autoscaling.DetachLoadBalancerTargetGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) *autoscaling.DetachLoadBalancerTargetGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1265,7 +1392,6 @@ func (_m *ASG) DetachLoadBalancerTargetGroups(ctx context.Context, params *autos } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DetachLoadBalancerTargetGroupsInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1287,6 +1413,10 @@ func (_m *ASG) DetachLoadBalancers(ctx context.Context, params *autoscaling.Deta ret := _m.Called(_ca...) var r0 *autoscaling.DetachLoadBalancersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachLoadBalancersInput, ...func(*autoscaling.Options)) (*autoscaling.DetachLoadBalancersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachLoadBalancersInput, ...func(*autoscaling.Options)) *autoscaling.DetachLoadBalancersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1295,7 +1425,6 @@ func (_m *ASG) DetachLoadBalancers(ctx context.Context, params *autoscaling.Deta } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DetachLoadBalancersInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1317,6 +1446,10 @@ func (_m *ASG) DetachTrafficSources(ctx context.Context, params *autoscaling.Det ret := _m.Called(_ca...) var r0 *autoscaling.DetachTrafficSourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachTrafficSourcesInput, ...func(*autoscaling.Options)) (*autoscaling.DetachTrafficSourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DetachTrafficSourcesInput, ...func(*autoscaling.Options)) *autoscaling.DetachTrafficSourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1325,7 +1458,6 @@ func (_m *ASG) DetachTrafficSources(ctx context.Context, params *autoscaling.Det } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DetachTrafficSourcesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1347,6 +1479,10 @@ func (_m *ASG) DisableMetricsCollection(ctx context.Context, params *autoscaling ret := _m.Called(_ca...) var r0 *autoscaling.DisableMetricsCollectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DisableMetricsCollectionInput, ...func(*autoscaling.Options)) (*autoscaling.DisableMetricsCollectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.DisableMetricsCollectionInput, ...func(*autoscaling.Options)) *autoscaling.DisableMetricsCollectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1355,7 +1491,6 @@ func (_m *ASG) DisableMetricsCollection(ctx context.Context, params *autoscaling } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.DisableMetricsCollectionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1377,6 +1512,10 @@ func (_m *ASG) EnableMetricsCollection(ctx context.Context, params *autoscaling. ret := _m.Called(_ca...) var r0 *autoscaling.EnableMetricsCollectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.EnableMetricsCollectionInput, ...func(*autoscaling.Options)) (*autoscaling.EnableMetricsCollectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.EnableMetricsCollectionInput, ...func(*autoscaling.Options)) *autoscaling.EnableMetricsCollectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1385,7 +1524,6 @@ func (_m *ASG) EnableMetricsCollection(ctx context.Context, params *autoscaling. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.EnableMetricsCollectionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1407,6 +1545,10 @@ func (_m *ASG) EnterStandby(ctx context.Context, params *autoscaling.EnterStandb ret := _m.Called(_ca...) var r0 *autoscaling.EnterStandbyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.EnterStandbyInput, ...func(*autoscaling.Options)) (*autoscaling.EnterStandbyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.EnterStandbyInput, ...func(*autoscaling.Options)) *autoscaling.EnterStandbyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1415,7 +1557,6 @@ func (_m *ASG) EnterStandby(ctx context.Context, params *autoscaling.EnterStandb } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.EnterStandbyInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1437,6 +1578,10 @@ func (_m *ASG) ExecutePolicy(ctx context.Context, params *autoscaling.ExecutePol ret := _m.Called(_ca...) var r0 *autoscaling.ExecutePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.ExecutePolicyInput, ...func(*autoscaling.Options)) (*autoscaling.ExecutePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.ExecutePolicyInput, ...func(*autoscaling.Options)) *autoscaling.ExecutePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1445,7 +1590,6 @@ func (_m *ASG) ExecutePolicy(ctx context.Context, params *autoscaling.ExecutePol } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.ExecutePolicyInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1467,6 +1611,10 @@ func (_m *ASG) ExitStandby(ctx context.Context, params *autoscaling.ExitStandbyI ret := _m.Called(_ca...) var r0 *autoscaling.ExitStandbyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.ExitStandbyInput, ...func(*autoscaling.Options)) (*autoscaling.ExitStandbyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.ExitStandbyInput, ...func(*autoscaling.Options)) *autoscaling.ExitStandbyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1475,7 +1623,6 @@ func (_m *ASG) ExitStandby(ctx context.Context, params *autoscaling.ExitStandbyI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.ExitStandbyInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1497,6 +1644,10 @@ func (_m *ASG) GetPredictiveScalingForecast(ctx context.Context, params *autosca ret := _m.Called(_ca...) var r0 *autoscaling.GetPredictiveScalingForecastOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.GetPredictiveScalingForecastInput, ...func(*autoscaling.Options)) (*autoscaling.GetPredictiveScalingForecastOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.GetPredictiveScalingForecastInput, ...func(*autoscaling.Options)) *autoscaling.GetPredictiveScalingForecastOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1505,7 +1656,6 @@ func (_m *ASG) GetPredictiveScalingForecast(ctx context.Context, params *autosca } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.GetPredictiveScalingForecastInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1527,6 +1677,10 @@ func (_m *ASG) PutLifecycleHook(ctx context.Context, params *autoscaling.PutLife ret := _m.Called(_ca...) var r0 *autoscaling.PutLifecycleHookOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutLifecycleHookInput, ...func(*autoscaling.Options)) (*autoscaling.PutLifecycleHookOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutLifecycleHookInput, ...func(*autoscaling.Options)) *autoscaling.PutLifecycleHookOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1535,7 +1689,6 @@ func (_m *ASG) PutLifecycleHook(ctx context.Context, params *autoscaling.PutLife } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.PutLifecycleHookInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1557,6 +1710,10 @@ func (_m *ASG) PutNotificationConfiguration(ctx context.Context, params *autosca ret := _m.Called(_ca...) var r0 *autoscaling.PutNotificationConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutNotificationConfigurationInput, ...func(*autoscaling.Options)) (*autoscaling.PutNotificationConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutNotificationConfigurationInput, ...func(*autoscaling.Options)) *autoscaling.PutNotificationConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1565,7 +1722,6 @@ func (_m *ASG) PutNotificationConfiguration(ctx context.Context, params *autosca } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.PutNotificationConfigurationInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1587,6 +1743,10 @@ func (_m *ASG) PutScalingPolicy(ctx context.Context, params *autoscaling.PutScal ret := _m.Called(_ca...) var r0 *autoscaling.PutScalingPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutScalingPolicyInput, ...func(*autoscaling.Options)) (*autoscaling.PutScalingPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutScalingPolicyInput, ...func(*autoscaling.Options)) *autoscaling.PutScalingPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1595,7 +1755,6 @@ func (_m *ASG) PutScalingPolicy(ctx context.Context, params *autoscaling.PutScal } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.PutScalingPolicyInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1617,6 +1776,10 @@ func (_m *ASG) PutScheduledUpdateGroupAction(ctx context.Context, params *autosc ret := _m.Called(_ca...) var r0 *autoscaling.PutScheduledUpdateGroupActionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutScheduledUpdateGroupActionInput, ...func(*autoscaling.Options)) (*autoscaling.PutScheduledUpdateGroupActionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutScheduledUpdateGroupActionInput, ...func(*autoscaling.Options)) *autoscaling.PutScheduledUpdateGroupActionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1625,7 +1788,6 @@ func (_m *ASG) PutScheduledUpdateGroupAction(ctx context.Context, params *autosc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.PutScheduledUpdateGroupActionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1647,6 +1809,10 @@ func (_m *ASG) PutWarmPool(ctx context.Context, params *autoscaling.PutWarmPoolI ret := _m.Called(_ca...) var r0 *autoscaling.PutWarmPoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutWarmPoolInput, ...func(*autoscaling.Options)) (*autoscaling.PutWarmPoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.PutWarmPoolInput, ...func(*autoscaling.Options)) *autoscaling.PutWarmPoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1655,7 +1821,6 @@ func (_m *ASG) PutWarmPool(ctx context.Context, params *autoscaling.PutWarmPoolI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.PutWarmPoolInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1677,6 +1842,10 @@ func (_m *ASG) RecordLifecycleActionHeartbeat(ctx context.Context, params *autos ret := _m.Called(_ca...) var r0 *autoscaling.RecordLifecycleActionHeartbeatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.RecordLifecycleActionHeartbeatInput, ...func(*autoscaling.Options)) (*autoscaling.RecordLifecycleActionHeartbeatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.RecordLifecycleActionHeartbeatInput, ...func(*autoscaling.Options)) *autoscaling.RecordLifecycleActionHeartbeatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1685,7 +1854,6 @@ func (_m *ASG) RecordLifecycleActionHeartbeat(ctx context.Context, params *autos } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.RecordLifecycleActionHeartbeatInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1707,6 +1875,10 @@ func (_m *ASG) ResumeProcesses(ctx context.Context, params *autoscaling.ResumePr ret := _m.Called(_ca...) var r0 *autoscaling.ResumeProcessesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.ResumeProcessesInput, ...func(*autoscaling.Options)) (*autoscaling.ResumeProcessesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.ResumeProcessesInput, ...func(*autoscaling.Options)) *autoscaling.ResumeProcessesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1715,7 +1887,6 @@ func (_m *ASG) ResumeProcesses(ctx context.Context, params *autoscaling.ResumePr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.ResumeProcessesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1737,6 +1908,10 @@ func (_m *ASG) RollbackInstanceRefresh(ctx context.Context, params *autoscaling. ret := _m.Called(_ca...) var r0 *autoscaling.RollbackInstanceRefreshOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.RollbackInstanceRefreshInput, ...func(*autoscaling.Options)) (*autoscaling.RollbackInstanceRefreshOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.RollbackInstanceRefreshInput, ...func(*autoscaling.Options)) *autoscaling.RollbackInstanceRefreshOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1745,7 +1920,6 @@ func (_m *ASG) RollbackInstanceRefresh(ctx context.Context, params *autoscaling. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.RollbackInstanceRefreshInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1767,6 +1941,10 @@ func (_m *ASG) SetDesiredCapacity(ctx context.Context, params *autoscaling.SetDe ret := _m.Called(_ca...) var r0 *autoscaling.SetDesiredCapacityOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SetDesiredCapacityInput, ...func(*autoscaling.Options)) (*autoscaling.SetDesiredCapacityOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SetDesiredCapacityInput, ...func(*autoscaling.Options)) *autoscaling.SetDesiredCapacityOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1775,7 +1953,6 @@ func (_m *ASG) SetDesiredCapacity(ctx context.Context, params *autoscaling.SetDe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.SetDesiredCapacityInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1797,6 +1974,10 @@ func (_m *ASG) SetInstanceHealth(ctx context.Context, params *autoscaling.SetIns ret := _m.Called(_ca...) var r0 *autoscaling.SetInstanceHealthOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SetInstanceHealthInput, ...func(*autoscaling.Options)) (*autoscaling.SetInstanceHealthOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SetInstanceHealthInput, ...func(*autoscaling.Options)) *autoscaling.SetInstanceHealthOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1805,7 +1986,6 @@ func (_m *ASG) SetInstanceHealth(ctx context.Context, params *autoscaling.SetIns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.SetInstanceHealthInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1827,6 +2007,10 @@ func (_m *ASG) SetInstanceProtection(ctx context.Context, params *autoscaling.Se ret := _m.Called(_ca...) var r0 *autoscaling.SetInstanceProtectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SetInstanceProtectionInput, ...func(*autoscaling.Options)) (*autoscaling.SetInstanceProtectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SetInstanceProtectionInput, ...func(*autoscaling.Options)) *autoscaling.SetInstanceProtectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1835,7 +2019,6 @@ func (_m *ASG) SetInstanceProtection(ctx context.Context, params *autoscaling.Se } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.SetInstanceProtectionInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1857,6 +2040,10 @@ func (_m *ASG) StartInstanceRefresh(ctx context.Context, params *autoscaling.Sta ret := _m.Called(_ca...) var r0 *autoscaling.StartInstanceRefreshOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.StartInstanceRefreshInput, ...func(*autoscaling.Options)) (*autoscaling.StartInstanceRefreshOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.StartInstanceRefreshInput, ...func(*autoscaling.Options)) *autoscaling.StartInstanceRefreshOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1865,7 +2052,6 @@ func (_m *ASG) StartInstanceRefresh(ctx context.Context, params *autoscaling.Sta } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.StartInstanceRefreshInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1887,6 +2073,10 @@ func (_m *ASG) SuspendProcesses(ctx context.Context, params *autoscaling.Suspend ret := _m.Called(_ca...) var r0 *autoscaling.SuspendProcessesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SuspendProcessesInput, ...func(*autoscaling.Options)) (*autoscaling.SuspendProcessesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.SuspendProcessesInput, ...func(*autoscaling.Options)) *autoscaling.SuspendProcessesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1895,7 +2085,6 @@ func (_m *ASG) SuspendProcesses(ctx context.Context, params *autoscaling.Suspend } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.SuspendProcessesInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1917,6 +2106,10 @@ func (_m *ASG) TerminateInstanceInAutoScalingGroup(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *autoscaling.TerminateInstanceInAutoScalingGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.TerminateInstanceInAutoScalingGroupInput, ...func(*autoscaling.Options)) (*autoscaling.TerminateInstanceInAutoScalingGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.TerminateInstanceInAutoScalingGroupInput, ...func(*autoscaling.Options)) *autoscaling.TerminateInstanceInAutoScalingGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1925,7 +2118,6 @@ func (_m *ASG) TerminateInstanceInAutoScalingGroup(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.TerminateInstanceInAutoScalingGroupInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1947,6 +2139,10 @@ func (_m *ASG) UpdateAutoScalingGroup(ctx context.Context, params *autoscaling.U ret := _m.Called(_ca...) var r0 *autoscaling.UpdateAutoScalingGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.UpdateAutoScalingGroupInput, ...func(*autoscaling.Options)) (*autoscaling.UpdateAutoScalingGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *autoscaling.UpdateAutoScalingGroupInput, ...func(*autoscaling.Options)) *autoscaling.UpdateAutoScalingGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1955,7 +2151,6 @@ func (_m *ASG) UpdateAutoScalingGroup(ctx context.Context, params *autoscaling.U } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *autoscaling.UpdateAutoScalingGroupInput, ...func(*autoscaling.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1964,3 +2159,17 @@ func (_m *ASG) UpdateAutoScalingGroup(ctx context.Context, params *autoscaling.U return r0, r1 } + +// NewASG creates a new instance of ASG. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewASG(t interface { + mock.TestingT + Cleanup(func()) +}) *ASG { + mock := &ASG{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/CloudFormation.go b/pkg/eks/mocksv2/CloudFormation.go index 7d5dc8e208..2fedae3a33 100644 --- a/pkg/eks/mocksv2/CloudFormation.go +++ b/pkg/eks/mocksv2/CloudFormation.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -27,6 +27,10 @@ func (_m *CloudFormation) ActivateOrganizationsAccess(ctx context.Context, param ret := _m.Called(_ca...) var r0 *cloudformation.ActivateOrganizationsAccessOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ActivateOrganizationsAccessInput, ...func(*cloudformation.Options)) (*cloudformation.ActivateOrganizationsAccessOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ActivateOrganizationsAccessInput, ...func(*cloudformation.Options)) *cloudformation.ActivateOrganizationsAccessOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -35,7 +39,6 @@ func (_m *CloudFormation) ActivateOrganizationsAccess(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ActivateOrganizationsAccessInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -57,6 +60,10 @@ func (_m *CloudFormation) ActivateType(ctx context.Context, params *cloudformati ret := _m.Called(_ca...) var r0 *cloudformation.ActivateTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ActivateTypeInput, ...func(*cloudformation.Options)) (*cloudformation.ActivateTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ActivateTypeInput, ...func(*cloudformation.Options)) *cloudformation.ActivateTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -65,7 +72,6 @@ func (_m *CloudFormation) ActivateType(ctx context.Context, params *cloudformati } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ActivateTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -87,6 +93,10 @@ func (_m *CloudFormation) BatchDescribeTypeConfigurations(ctx context.Context, p ret := _m.Called(_ca...) var r0 *cloudformation.BatchDescribeTypeConfigurationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.BatchDescribeTypeConfigurationsInput, ...func(*cloudformation.Options)) (*cloudformation.BatchDescribeTypeConfigurationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.BatchDescribeTypeConfigurationsInput, ...func(*cloudformation.Options)) *cloudformation.BatchDescribeTypeConfigurationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -95,7 +105,6 @@ func (_m *CloudFormation) BatchDescribeTypeConfigurations(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.BatchDescribeTypeConfigurationsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -117,6 +126,10 @@ func (_m *CloudFormation) CancelUpdateStack(ctx context.Context, params *cloudfo ret := _m.Called(_ca...) var r0 *cloudformation.CancelUpdateStackOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CancelUpdateStackInput, ...func(*cloudformation.Options)) (*cloudformation.CancelUpdateStackOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CancelUpdateStackInput, ...func(*cloudformation.Options)) *cloudformation.CancelUpdateStackOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -125,7 +138,6 @@ func (_m *CloudFormation) CancelUpdateStack(ctx context.Context, params *cloudfo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.CancelUpdateStackInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -147,6 +159,10 @@ func (_m *CloudFormation) ContinueUpdateRollback(ctx context.Context, params *cl ret := _m.Called(_ca...) var r0 *cloudformation.ContinueUpdateRollbackOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ContinueUpdateRollbackInput, ...func(*cloudformation.Options)) (*cloudformation.ContinueUpdateRollbackOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ContinueUpdateRollbackInput, ...func(*cloudformation.Options)) *cloudformation.ContinueUpdateRollbackOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -155,7 +171,6 @@ func (_m *CloudFormation) ContinueUpdateRollback(ctx context.Context, params *cl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ContinueUpdateRollbackInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -177,6 +192,10 @@ func (_m *CloudFormation) CreateChangeSet(ctx context.Context, params *cloudform ret := _m.Called(_ca...) var r0 *cloudformation.CreateChangeSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateChangeSetInput, ...func(*cloudformation.Options)) (*cloudformation.CreateChangeSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateChangeSetInput, ...func(*cloudformation.Options)) *cloudformation.CreateChangeSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -185,7 +204,6 @@ func (_m *CloudFormation) CreateChangeSet(ctx context.Context, params *cloudform } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.CreateChangeSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -207,6 +225,10 @@ func (_m *CloudFormation) CreateStack(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.CreateStackOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateStackInput, ...func(*cloudformation.Options)) (*cloudformation.CreateStackOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateStackInput, ...func(*cloudformation.Options)) *cloudformation.CreateStackOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -215,7 +237,6 @@ func (_m *CloudFormation) CreateStack(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.CreateStackInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -237,6 +258,10 @@ func (_m *CloudFormation) CreateStackInstances(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudformation.CreateStackInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateStackInstancesInput, ...func(*cloudformation.Options)) (*cloudformation.CreateStackInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateStackInstancesInput, ...func(*cloudformation.Options)) *cloudformation.CreateStackInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -245,7 +270,6 @@ func (_m *CloudFormation) CreateStackInstances(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.CreateStackInstancesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -267,6 +291,10 @@ func (_m *CloudFormation) CreateStackSet(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.CreateStackSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateStackSetInput, ...func(*cloudformation.Options)) (*cloudformation.CreateStackSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.CreateStackSetInput, ...func(*cloudformation.Options)) *cloudformation.CreateStackSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -275,7 +303,6 @@ func (_m *CloudFormation) CreateStackSet(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.CreateStackSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -297,6 +324,10 @@ func (_m *CloudFormation) DeactivateOrganizationsAccess(ctx context.Context, par ret := _m.Called(_ca...) var r0 *cloudformation.DeactivateOrganizationsAccessOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeactivateOrganizationsAccessInput, ...func(*cloudformation.Options)) (*cloudformation.DeactivateOrganizationsAccessOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeactivateOrganizationsAccessInput, ...func(*cloudformation.Options)) *cloudformation.DeactivateOrganizationsAccessOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -305,7 +336,6 @@ func (_m *CloudFormation) DeactivateOrganizationsAccess(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeactivateOrganizationsAccessInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -327,6 +357,10 @@ func (_m *CloudFormation) DeactivateType(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.DeactivateTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeactivateTypeInput, ...func(*cloudformation.Options)) (*cloudformation.DeactivateTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeactivateTypeInput, ...func(*cloudformation.Options)) *cloudformation.DeactivateTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -335,7 +369,6 @@ func (_m *CloudFormation) DeactivateType(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeactivateTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -357,6 +390,10 @@ func (_m *CloudFormation) DeleteChangeSet(ctx context.Context, params *cloudform ret := _m.Called(_ca...) var r0 *cloudformation.DeleteChangeSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteChangeSetInput, ...func(*cloudformation.Options)) (*cloudformation.DeleteChangeSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteChangeSetInput, ...func(*cloudformation.Options)) *cloudformation.DeleteChangeSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -365,7 +402,6 @@ func (_m *CloudFormation) DeleteChangeSet(ctx context.Context, params *cloudform } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeleteChangeSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -387,6 +423,10 @@ func (_m *CloudFormation) DeleteStack(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.DeleteStackOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteStackInput, ...func(*cloudformation.Options)) (*cloudformation.DeleteStackOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteStackInput, ...func(*cloudformation.Options)) *cloudformation.DeleteStackOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -395,7 +435,6 @@ func (_m *CloudFormation) DeleteStack(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeleteStackInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -417,6 +456,10 @@ func (_m *CloudFormation) DeleteStackInstances(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudformation.DeleteStackInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteStackInstancesInput, ...func(*cloudformation.Options)) (*cloudformation.DeleteStackInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteStackInstancesInput, ...func(*cloudformation.Options)) *cloudformation.DeleteStackInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -425,7 +468,6 @@ func (_m *CloudFormation) DeleteStackInstances(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeleteStackInstancesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -447,6 +489,10 @@ func (_m *CloudFormation) DeleteStackSet(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.DeleteStackSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteStackSetInput, ...func(*cloudformation.Options)) (*cloudformation.DeleteStackSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeleteStackSetInput, ...func(*cloudformation.Options)) *cloudformation.DeleteStackSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -455,7 +501,6 @@ func (_m *CloudFormation) DeleteStackSet(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeleteStackSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -477,6 +522,10 @@ func (_m *CloudFormation) DeregisterType(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.DeregisterTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeregisterTypeInput, ...func(*cloudformation.Options)) (*cloudformation.DeregisterTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DeregisterTypeInput, ...func(*cloudformation.Options)) *cloudformation.DeregisterTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -485,7 +534,6 @@ func (_m *CloudFormation) DeregisterType(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DeregisterTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -507,6 +555,10 @@ func (_m *CloudFormation) DescribeAccountLimits(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.DescribeAccountLimitsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeAccountLimitsInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeAccountLimitsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeAccountLimitsInput, ...func(*cloudformation.Options)) *cloudformation.DescribeAccountLimitsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -515,7 +567,6 @@ func (_m *CloudFormation) DescribeAccountLimits(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeAccountLimitsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -537,6 +588,10 @@ func (_m *CloudFormation) DescribeChangeSet(ctx context.Context, params *cloudfo ret := _m.Called(_ca...) var r0 *cloudformation.DescribeChangeSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeChangeSetInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeChangeSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeChangeSetInput, ...func(*cloudformation.Options)) *cloudformation.DescribeChangeSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -545,7 +600,6 @@ func (_m *CloudFormation) DescribeChangeSet(ctx context.Context, params *cloudfo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeChangeSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -567,6 +621,10 @@ func (_m *CloudFormation) DescribeChangeSetHooks(ctx context.Context, params *cl ret := _m.Called(_ca...) var r0 *cloudformation.DescribeChangeSetHooksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeChangeSetHooksInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeChangeSetHooksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeChangeSetHooksInput, ...func(*cloudformation.Options)) *cloudformation.DescribeChangeSetHooksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -575,7 +633,6 @@ func (_m *CloudFormation) DescribeChangeSetHooks(ctx context.Context, params *cl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeChangeSetHooksInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -597,6 +654,10 @@ func (_m *CloudFormation) DescribeOrganizationsAccess(ctx context.Context, param ret := _m.Called(_ca...) var r0 *cloudformation.DescribeOrganizationsAccessOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeOrganizationsAccessInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeOrganizationsAccessOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeOrganizationsAccessInput, ...func(*cloudformation.Options)) *cloudformation.DescribeOrganizationsAccessOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -605,7 +666,6 @@ func (_m *CloudFormation) DescribeOrganizationsAccess(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeOrganizationsAccessInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -627,6 +687,10 @@ func (_m *CloudFormation) DescribePublisher(ctx context.Context, params *cloudfo ret := _m.Called(_ca...) var r0 *cloudformation.DescribePublisherOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribePublisherInput, ...func(*cloudformation.Options)) (*cloudformation.DescribePublisherOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribePublisherInput, ...func(*cloudformation.Options)) *cloudformation.DescribePublisherOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -635,7 +699,6 @@ func (_m *CloudFormation) DescribePublisher(ctx context.Context, params *cloudfo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribePublisherInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -657,6 +720,10 @@ func (_m *CloudFormation) DescribeStackDriftDetectionStatus(ctx context.Context, ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackDriftDetectionStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackDriftDetectionStatusInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackDriftDetectionStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackDriftDetectionStatusInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackDriftDetectionStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -665,7 +732,6 @@ func (_m *CloudFormation) DescribeStackDriftDetectionStatus(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackDriftDetectionStatusInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -687,6 +753,10 @@ func (_m *CloudFormation) DescribeStackEvents(ctx context.Context, params *cloud ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackEventsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackEventsInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackEventsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackEventsInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackEventsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -695,7 +765,6 @@ func (_m *CloudFormation) DescribeStackEvents(ctx context.Context, params *cloud } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackEventsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -717,6 +786,10 @@ func (_m *CloudFormation) DescribeStackInstance(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackInstanceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackInstanceInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackInstanceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackInstanceInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackInstanceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -725,7 +798,6 @@ func (_m *CloudFormation) DescribeStackInstance(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackInstanceInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -747,6 +819,10 @@ func (_m *CloudFormation) DescribeStackResource(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackResourceInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackResourceInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -755,7 +831,6 @@ func (_m *CloudFormation) DescribeStackResource(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackResourceInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -777,6 +852,10 @@ func (_m *CloudFormation) DescribeStackResourceDrifts(ctx context.Context, param ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackResourceDriftsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackResourceDriftsInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackResourceDriftsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackResourceDriftsInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackResourceDriftsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -785,7 +864,6 @@ func (_m *CloudFormation) DescribeStackResourceDrifts(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackResourceDriftsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -807,6 +885,10 @@ func (_m *CloudFormation) DescribeStackResources(ctx context.Context, params *cl ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackResourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackResourcesInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackResourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackResourcesInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackResourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -815,7 +897,6 @@ func (_m *CloudFormation) DescribeStackResources(ctx context.Context, params *cl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackResourcesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -837,6 +918,10 @@ func (_m *CloudFormation) DescribeStackSet(ctx context.Context, params *cloudfor ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackSetInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackSetInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -845,7 +930,6 @@ func (_m *CloudFormation) DescribeStackSet(ctx context.Context, params *cloudfor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -867,6 +951,10 @@ func (_m *CloudFormation) DescribeStackSetOperation(ctx context.Context, params ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStackSetOperationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackSetOperationInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStackSetOperationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStackSetOperationInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStackSetOperationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -875,7 +963,6 @@ func (_m *CloudFormation) DescribeStackSetOperation(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStackSetOperationInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -897,6 +984,10 @@ func (_m *CloudFormation) DescribeStacks(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.DescribeStacksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStacksInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeStacksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeStacksInput, ...func(*cloudformation.Options)) *cloudformation.DescribeStacksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -905,7 +996,6 @@ func (_m *CloudFormation) DescribeStacks(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeStacksInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -927,6 +1017,10 @@ func (_m *CloudFormation) DescribeType(ctx context.Context, params *cloudformati ret := _m.Called(_ca...) var r0 *cloudformation.DescribeTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeTypeInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeTypeInput, ...func(*cloudformation.Options)) *cloudformation.DescribeTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -935,7 +1029,6 @@ func (_m *CloudFormation) DescribeType(ctx context.Context, params *cloudformati } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -957,6 +1050,10 @@ func (_m *CloudFormation) DescribeTypeRegistration(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *cloudformation.DescribeTypeRegistrationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeTypeRegistrationInput, ...func(*cloudformation.Options)) (*cloudformation.DescribeTypeRegistrationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DescribeTypeRegistrationInput, ...func(*cloudformation.Options)) *cloudformation.DescribeTypeRegistrationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -965,7 +1062,6 @@ func (_m *CloudFormation) DescribeTypeRegistration(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DescribeTypeRegistrationInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -987,6 +1083,10 @@ func (_m *CloudFormation) DetectStackDrift(ctx context.Context, params *cloudfor ret := _m.Called(_ca...) var r0 *cloudformation.DetectStackDriftOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DetectStackDriftInput, ...func(*cloudformation.Options)) (*cloudformation.DetectStackDriftOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DetectStackDriftInput, ...func(*cloudformation.Options)) *cloudformation.DetectStackDriftOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -995,7 +1095,6 @@ func (_m *CloudFormation) DetectStackDrift(ctx context.Context, params *cloudfor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DetectStackDriftInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1017,6 +1116,10 @@ func (_m *CloudFormation) DetectStackResourceDrift(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *cloudformation.DetectStackResourceDriftOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DetectStackResourceDriftInput, ...func(*cloudformation.Options)) (*cloudformation.DetectStackResourceDriftOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DetectStackResourceDriftInput, ...func(*cloudformation.Options)) *cloudformation.DetectStackResourceDriftOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1025,7 +1128,6 @@ func (_m *CloudFormation) DetectStackResourceDrift(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DetectStackResourceDriftInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1047,6 +1149,10 @@ func (_m *CloudFormation) DetectStackSetDrift(ctx context.Context, params *cloud ret := _m.Called(_ca...) var r0 *cloudformation.DetectStackSetDriftOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DetectStackSetDriftInput, ...func(*cloudformation.Options)) (*cloudformation.DetectStackSetDriftOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.DetectStackSetDriftInput, ...func(*cloudformation.Options)) *cloudformation.DetectStackSetDriftOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1055,7 +1161,6 @@ func (_m *CloudFormation) DetectStackSetDrift(ctx context.Context, params *cloud } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.DetectStackSetDriftInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1077,6 +1182,10 @@ func (_m *CloudFormation) EstimateTemplateCost(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudformation.EstimateTemplateCostOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.EstimateTemplateCostInput, ...func(*cloudformation.Options)) (*cloudformation.EstimateTemplateCostOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.EstimateTemplateCostInput, ...func(*cloudformation.Options)) *cloudformation.EstimateTemplateCostOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1085,7 +1194,6 @@ func (_m *CloudFormation) EstimateTemplateCost(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.EstimateTemplateCostInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1107,6 +1215,10 @@ func (_m *CloudFormation) ExecuteChangeSet(ctx context.Context, params *cloudfor ret := _m.Called(_ca...) var r0 *cloudformation.ExecuteChangeSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ExecuteChangeSetInput, ...func(*cloudformation.Options)) (*cloudformation.ExecuteChangeSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ExecuteChangeSetInput, ...func(*cloudformation.Options)) *cloudformation.ExecuteChangeSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1115,7 +1227,6 @@ func (_m *CloudFormation) ExecuteChangeSet(ctx context.Context, params *cloudfor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ExecuteChangeSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1137,6 +1248,10 @@ func (_m *CloudFormation) GetStackPolicy(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.GetStackPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.GetStackPolicyInput, ...func(*cloudformation.Options)) (*cloudformation.GetStackPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.GetStackPolicyInput, ...func(*cloudformation.Options)) *cloudformation.GetStackPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1145,7 +1260,6 @@ func (_m *CloudFormation) GetStackPolicy(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.GetStackPolicyInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1167,6 +1281,10 @@ func (_m *CloudFormation) GetTemplate(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.GetTemplateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.GetTemplateInput, ...func(*cloudformation.Options)) (*cloudformation.GetTemplateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.GetTemplateInput, ...func(*cloudformation.Options)) *cloudformation.GetTemplateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1175,7 +1293,6 @@ func (_m *CloudFormation) GetTemplate(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.GetTemplateInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1197,6 +1314,10 @@ func (_m *CloudFormation) GetTemplateSummary(ctx context.Context, params *cloudf ret := _m.Called(_ca...) var r0 *cloudformation.GetTemplateSummaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.GetTemplateSummaryInput, ...func(*cloudformation.Options)) (*cloudformation.GetTemplateSummaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.GetTemplateSummaryInput, ...func(*cloudformation.Options)) *cloudformation.GetTemplateSummaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1205,7 +1326,6 @@ func (_m *CloudFormation) GetTemplateSummary(ctx context.Context, params *cloudf } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.GetTemplateSummaryInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1227,6 +1347,10 @@ func (_m *CloudFormation) ImportStacksToStackSet(ctx context.Context, params *cl ret := _m.Called(_ca...) var r0 *cloudformation.ImportStacksToStackSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ImportStacksToStackSetInput, ...func(*cloudformation.Options)) (*cloudformation.ImportStacksToStackSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ImportStacksToStackSetInput, ...func(*cloudformation.Options)) *cloudformation.ImportStacksToStackSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1235,7 +1359,6 @@ func (_m *CloudFormation) ImportStacksToStackSet(ctx context.Context, params *cl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ImportStacksToStackSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1257,6 +1380,10 @@ func (_m *CloudFormation) ListChangeSets(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.ListChangeSetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListChangeSetsInput, ...func(*cloudformation.Options)) (*cloudformation.ListChangeSetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListChangeSetsInput, ...func(*cloudformation.Options)) *cloudformation.ListChangeSetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1265,7 +1392,6 @@ func (_m *CloudFormation) ListChangeSets(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListChangeSetsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1287,6 +1413,10 @@ func (_m *CloudFormation) ListExports(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.ListExportsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListExportsInput, ...func(*cloudformation.Options)) (*cloudformation.ListExportsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListExportsInput, ...func(*cloudformation.Options)) *cloudformation.ListExportsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1295,7 +1425,6 @@ func (_m *CloudFormation) ListExports(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListExportsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1317,6 +1446,10 @@ func (_m *CloudFormation) ListImports(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.ListImportsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListImportsInput, ...func(*cloudformation.Options)) (*cloudformation.ListImportsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListImportsInput, ...func(*cloudformation.Options)) *cloudformation.ListImportsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1325,7 +1458,6 @@ func (_m *CloudFormation) ListImports(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListImportsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1335,6 +1467,39 @@ func (_m *CloudFormation) ListImports(ctx context.Context, params *cloudformatio return r0, r1 } +// ListStackInstanceResourceDrifts provides a mock function with given fields: ctx, params, optFns +func (_m *CloudFormation) ListStackInstanceResourceDrifts(ctx context.Context, params *cloudformation.ListStackInstanceResourceDriftsInput, optFns ...func(*cloudformation.Options)) (*cloudformation.ListStackInstanceResourceDriftsOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *cloudformation.ListStackInstanceResourceDriftsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackInstanceResourceDriftsInput, ...func(*cloudformation.Options)) (*cloudformation.ListStackInstanceResourceDriftsOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackInstanceResourceDriftsInput, ...func(*cloudformation.Options)) *cloudformation.ListStackInstanceResourceDriftsOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*cloudformation.ListStackInstanceResourceDriftsOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStackInstanceResourceDriftsInput, ...func(*cloudformation.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // ListStackInstances provides a mock function with given fields: ctx, params, optFns func (_m *CloudFormation) ListStackInstances(ctx context.Context, params *cloudformation.ListStackInstancesInput, optFns ...func(*cloudformation.Options)) (*cloudformation.ListStackInstancesOutput, error) { _va := make([]interface{}, len(optFns)) @@ -1347,6 +1512,10 @@ func (_m *CloudFormation) ListStackInstances(ctx context.Context, params *cloudf ret := _m.Called(_ca...) var r0 *cloudformation.ListStackInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackInstancesInput, ...func(*cloudformation.Options)) (*cloudformation.ListStackInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackInstancesInput, ...func(*cloudformation.Options)) *cloudformation.ListStackInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1355,7 +1524,6 @@ func (_m *CloudFormation) ListStackInstances(ctx context.Context, params *cloudf } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStackInstancesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1377,6 +1545,10 @@ func (_m *CloudFormation) ListStackResources(ctx context.Context, params *cloudf ret := _m.Called(_ca...) var r0 *cloudformation.ListStackResourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackResourcesInput, ...func(*cloudformation.Options)) (*cloudformation.ListStackResourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackResourcesInput, ...func(*cloudformation.Options)) *cloudformation.ListStackResourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1385,7 +1557,6 @@ func (_m *CloudFormation) ListStackResources(ctx context.Context, params *cloudf } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStackResourcesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1407,6 +1578,10 @@ func (_m *CloudFormation) ListStackSetOperationResults(ctx context.Context, para ret := _m.Called(_ca...) var r0 *cloudformation.ListStackSetOperationResultsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackSetOperationResultsInput, ...func(*cloudformation.Options)) (*cloudformation.ListStackSetOperationResultsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackSetOperationResultsInput, ...func(*cloudformation.Options)) *cloudformation.ListStackSetOperationResultsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1415,7 +1590,6 @@ func (_m *CloudFormation) ListStackSetOperationResults(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStackSetOperationResultsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1437,6 +1611,10 @@ func (_m *CloudFormation) ListStackSetOperations(ctx context.Context, params *cl ret := _m.Called(_ca...) var r0 *cloudformation.ListStackSetOperationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackSetOperationsInput, ...func(*cloudformation.Options)) (*cloudformation.ListStackSetOperationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackSetOperationsInput, ...func(*cloudformation.Options)) *cloudformation.ListStackSetOperationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1445,7 +1623,6 @@ func (_m *CloudFormation) ListStackSetOperations(ctx context.Context, params *cl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStackSetOperationsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1467,6 +1644,10 @@ func (_m *CloudFormation) ListStackSets(ctx context.Context, params *cloudformat ret := _m.Called(_ca...) var r0 *cloudformation.ListStackSetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackSetsInput, ...func(*cloudformation.Options)) (*cloudformation.ListStackSetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStackSetsInput, ...func(*cloudformation.Options)) *cloudformation.ListStackSetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1475,7 +1656,6 @@ func (_m *CloudFormation) ListStackSets(ctx context.Context, params *cloudformat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStackSetsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1497,6 +1677,10 @@ func (_m *CloudFormation) ListStacks(ctx context.Context, params *cloudformation ret := _m.Called(_ca...) var r0 *cloudformation.ListStacksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStacksInput, ...func(*cloudformation.Options)) (*cloudformation.ListStacksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListStacksInput, ...func(*cloudformation.Options)) *cloudformation.ListStacksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1505,7 +1689,6 @@ func (_m *CloudFormation) ListStacks(ctx context.Context, params *cloudformation } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListStacksInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1527,6 +1710,10 @@ func (_m *CloudFormation) ListTypeRegistrations(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.ListTypeRegistrationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListTypeRegistrationsInput, ...func(*cloudformation.Options)) (*cloudformation.ListTypeRegistrationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListTypeRegistrationsInput, ...func(*cloudformation.Options)) *cloudformation.ListTypeRegistrationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1535,7 +1722,6 @@ func (_m *CloudFormation) ListTypeRegistrations(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListTypeRegistrationsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1557,6 +1743,10 @@ func (_m *CloudFormation) ListTypeVersions(ctx context.Context, params *cloudfor ret := _m.Called(_ca...) var r0 *cloudformation.ListTypeVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListTypeVersionsInput, ...func(*cloudformation.Options)) (*cloudformation.ListTypeVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListTypeVersionsInput, ...func(*cloudformation.Options)) *cloudformation.ListTypeVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1565,7 +1755,6 @@ func (_m *CloudFormation) ListTypeVersions(ctx context.Context, params *cloudfor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListTypeVersionsInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1587,6 +1776,10 @@ func (_m *CloudFormation) ListTypes(ctx context.Context, params *cloudformation. ret := _m.Called(_ca...) var r0 *cloudformation.ListTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListTypesInput, ...func(*cloudformation.Options)) (*cloudformation.ListTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ListTypesInput, ...func(*cloudformation.Options)) *cloudformation.ListTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1595,7 +1788,6 @@ func (_m *CloudFormation) ListTypes(ctx context.Context, params *cloudformation. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ListTypesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1617,6 +1809,10 @@ func (_m *CloudFormation) PublishType(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.PublishTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.PublishTypeInput, ...func(*cloudformation.Options)) (*cloudformation.PublishTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.PublishTypeInput, ...func(*cloudformation.Options)) *cloudformation.PublishTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1625,7 +1821,6 @@ func (_m *CloudFormation) PublishType(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.PublishTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1647,6 +1842,10 @@ func (_m *CloudFormation) RecordHandlerProgress(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.RecordHandlerProgressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RecordHandlerProgressInput, ...func(*cloudformation.Options)) (*cloudformation.RecordHandlerProgressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RecordHandlerProgressInput, ...func(*cloudformation.Options)) *cloudformation.RecordHandlerProgressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1655,7 +1854,6 @@ func (_m *CloudFormation) RecordHandlerProgress(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.RecordHandlerProgressInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1677,6 +1875,10 @@ func (_m *CloudFormation) RegisterPublisher(ctx context.Context, params *cloudfo ret := _m.Called(_ca...) var r0 *cloudformation.RegisterPublisherOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RegisterPublisherInput, ...func(*cloudformation.Options)) (*cloudformation.RegisterPublisherOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RegisterPublisherInput, ...func(*cloudformation.Options)) *cloudformation.RegisterPublisherOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1685,7 +1887,6 @@ func (_m *CloudFormation) RegisterPublisher(ctx context.Context, params *cloudfo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.RegisterPublisherInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1707,6 +1908,10 @@ func (_m *CloudFormation) RegisterType(ctx context.Context, params *cloudformati ret := _m.Called(_ca...) var r0 *cloudformation.RegisterTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RegisterTypeInput, ...func(*cloudformation.Options)) (*cloudformation.RegisterTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RegisterTypeInput, ...func(*cloudformation.Options)) *cloudformation.RegisterTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1715,7 +1920,6 @@ func (_m *CloudFormation) RegisterType(ctx context.Context, params *cloudformati } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.RegisterTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1737,6 +1941,10 @@ func (_m *CloudFormation) RollbackStack(ctx context.Context, params *cloudformat ret := _m.Called(_ca...) var r0 *cloudformation.RollbackStackOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RollbackStackInput, ...func(*cloudformation.Options)) (*cloudformation.RollbackStackOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.RollbackStackInput, ...func(*cloudformation.Options)) *cloudformation.RollbackStackOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1745,7 +1953,6 @@ func (_m *CloudFormation) RollbackStack(ctx context.Context, params *cloudformat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.RollbackStackInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1767,6 +1974,10 @@ func (_m *CloudFormation) SetStackPolicy(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.SetStackPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SetStackPolicyInput, ...func(*cloudformation.Options)) (*cloudformation.SetStackPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SetStackPolicyInput, ...func(*cloudformation.Options)) *cloudformation.SetStackPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1775,7 +1986,6 @@ func (_m *CloudFormation) SetStackPolicy(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.SetStackPolicyInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1797,6 +2007,10 @@ func (_m *CloudFormation) SetTypeConfiguration(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudformation.SetTypeConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SetTypeConfigurationInput, ...func(*cloudformation.Options)) (*cloudformation.SetTypeConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SetTypeConfigurationInput, ...func(*cloudformation.Options)) *cloudformation.SetTypeConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1805,7 +2019,6 @@ func (_m *CloudFormation) SetTypeConfiguration(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.SetTypeConfigurationInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1827,6 +2040,10 @@ func (_m *CloudFormation) SetTypeDefaultVersion(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.SetTypeDefaultVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SetTypeDefaultVersionInput, ...func(*cloudformation.Options)) (*cloudformation.SetTypeDefaultVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SetTypeDefaultVersionInput, ...func(*cloudformation.Options)) *cloudformation.SetTypeDefaultVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1835,7 +2052,6 @@ func (_m *CloudFormation) SetTypeDefaultVersion(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.SetTypeDefaultVersionInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1857,6 +2073,10 @@ func (_m *CloudFormation) SignalResource(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.SignalResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SignalResourceInput, ...func(*cloudformation.Options)) (*cloudformation.SignalResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.SignalResourceInput, ...func(*cloudformation.Options)) *cloudformation.SignalResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1865,7 +2085,6 @@ func (_m *CloudFormation) SignalResource(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.SignalResourceInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1887,6 +2106,10 @@ func (_m *CloudFormation) StopStackSetOperation(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudformation.StopStackSetOperationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.StopStackSetOperationInput, ...func(*cloudformation.Options)) (*cloudformation.StopStackSetOperationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.StopStackSetOperationInput, ...func(*cloudformation.Options)) *cloudformation.StopStackSetOperationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1895,7 +2118,6 @@ func (_m *CloudFormation) StopStackSetOperation(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.StopStackSetOperationInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1917,6 +2139,10 @@ func (_m *CloudFormation) TestType(ctx context.Context, params *cloudformation.T ret := _m.Called(_ca...) var r0 *cloudformation.TestTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.TestTypeInput, ...func(*cloudformation.Options)) (*cloudformation.TestTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.TestTypeInput, ...func(*cloudformation.Options)) *cloudformation.TestTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1925,7 +2151,6 @@ func (_m *CloudFormation) TestType(ctx context.Context, params *cloudformation.T } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.TestTypeInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1947,6 +2172,10 @@ func (_m *CloudFormation) UpdateStack(ctx context.Context, params *cloudformatio ret := _m.Called(_ca...) var r0 *cloudformation.UpdateStackOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateStackInput, ...func(*cloudformation.Options)) (*cloudformation.UpdateStackOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateStackInput, ...func(*cloudformation.Options)) *cloudformation.UpdateStackOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1955,7 +2184,6 @@ func (_m *CloudFormation) UpdateStack(ctx context.Context, params *cloudformatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.UpdateStackInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1977,6 +2205,10 @@ func (_m *CloudFormation) UpdateStackInstances(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudformation.UpdateStackInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateStackInstancesInput, ...func(*cloudformation.Options)) (*cloudformation.UpdateStackInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateStackInstancesInput, ...func(*cloudformation.Options)) *cloudformation.UpdateStackInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1985,7 +2217,6 @@ func (_m *CloudFormation) UpdateStackInstances(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.UpdateStackInstancesInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2007,6 +2238,10 @@ func (_m *CloudFormation) UpdateStackSet(ctx context.Context, params *cloudforma ret := _m.Called(_ca...) var r0 *cloudformation.UpdateStackSetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateStackSetInput, ...func(*cloudformation.Options)) (*cloudformation.UpdateStackSetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateStackSetInput, ...func(*cloudformation.Options)) *cloudformation.UpdateStackSetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2015,7 +2250,6 @@ func (_m *CloudFormation) UpdateStackSet(ctx context.Context, params *cloudforma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.UpdateStackSetInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2037,6 +2271,10 @@ func (_m *CloudFormation) UpdateTerminationProtection(ctx context.Context, param ret := _m.Called(_ca...) var r0 *cloudformation.UpdateTerminationProtectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateTerminationProtectionInput, ...func(*cloudformation.Options)) (*cloudformation.UpdateTerminationProtectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.UpdateTerminationProtectionInput, ...func(*cloudformation.Options)) *cloudformation.UpdateTerminationProtectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2045,7 +2283,6 @@ func (_m *CloudFormation) UpdateTerminationProtection(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.UpdateTerminationProtectionInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2067,6 +2304,10 @@ func (_m *CloudFormation) ValidateTemplate(ctx context.Context, params *cloudfor ret := _m.Called(_ca...) var r0 *cloudformation.ValidateTemplateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ValidateTemplateInput, ...func(*cloudformation.Options)) (*cloudformation.ValidateTemplateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudformation.ValidateTemplateInput, ...func(*cloudformation.Options)) *cloudformation.ValidateTemplateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2075,7 +2316,6 @@ func (_m *CloudFormation) ValidateTemplate(ctx context.Context, params *cloudfor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudformation.ValidateTemplateInput, ...func(*cloudformation.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2084,3 +2324,17 @@ func (_m *CloudFormation) ValidateTemplate(ctx context.Context, params *cloudfor return r0, r1 } + +// NewCloudFormation creates a new instance of CloudFormation. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewCloudFormation(t interface { + mock.TestingT + Cleanup(func()) +}) *CloudFormation { + mock := &CloudFormation{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/CloudTrail.go b/pkg/eks/mocksv2/CloudTrail.go index 8b848812fe..e42d9037fe 100644 --- a/pkg/eks/mocksv2/CloudTrail.go +++ b/pkg/eks/mocksv2/CloudTrail.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -27,6 +27,10 @@ func (_m *CloudTrail) AddTags(ctx context.Context, params *cloudtrail.AddTagsInp ret := _m.Called(_ca...) var r0 *cloudtrail.AddTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.AddTagsInput, ...func(*cloudtrail.Options)) (*cloudtrail.AddTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.AddTagsInput, ...func(*cloudtrail.Options)) *cloudtrail.AddTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -35,7 +39,6 @@ func (_m *CloudTrail) AddTags(ctx context.Context, params *cloudtrail.AddTagsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.AddTagsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -57,6 +60,10 @@ func (_m *CloudTrail) CancelQuery(ctx context.Context, params *cloudtrail.Cancel ret := _m.Called(_ca...) var r0 *cloudtrail.CancelQueryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CancelQueryInput, ...func(*cloudtrail.Options)) (*cloudtrail.CancelQueryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CancelQueryInput, ...func(*cloudtrail.Options)) *cloudtrail.CancelQueryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -65,7 +72,6 @@ func (_m *CloudTrail) CancelQuery(ctx context.Context, params *cloudtrail.Cancel } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.CancelQueryInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -87,6 +93,10 @@ func (_m *CloudTrail) CreateChannel(ctx context.Context, params *cloudtrail.Crea ret := _m.Called(_ca...) var r0 *cloudtrail.CreateChannelOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CreateChannelInput, ...func(*cloudtrail.Options)) (*cloudtrail.CreateChannelOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CreateChannelInput, ...func(*cloudtrail.Options)) *cloudtrail.CreateChannelOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -95,7 +105,6 @@ func (_m *CloudTrail) CreateChannel(ctx context.Context, params *cloudtrail.Crea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.CreateChannelInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -117,6 +126,10 @@ func (_m *CloudTrail) CreateEventDataStore(ctx context.Context, params *cloudtra ret := _m.Called(_ca...) var r0 *cloudtrail.CreateEventDataStoreOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CreateEventDataStoreInput, ...func(*cloudtrail.Options)) (*cloudtrail.CreateEventDataStoreOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CreateEventDataStoreInput, ...func(*cloudtrail.Options)) *cloudtrail.CreateEventDataStoreOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -125,7 +138,6 @@ func (_m *CloudTrail) CreateEventDataStore(ctx context.Context, params *cloudtra } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.CreateEventDataStoreInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -147,6 +159,10 @@ func (_m *CloudTrail) CreateTrail(ctx context.Context, params *cloudtrail.Create ret := _m.Called(_ca...) var r0 *cloudtrail.CreateTrailOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CreateTrailInput, ...func(*cloudtrail.Options)) (*cloudtrail.CreateTrailOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.CreateTrailInput, ...func(*cloudtrail.Options)) *cloudtrail.CreateTrailOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -155,7 +171,6 @@ func (_m *CloudTrail) CreateTrail(ctx context.Context, params *cloudtrail.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.CreateTrailInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -177,6 +192,10 @@ func (_m *CloudTrail) DeleteChannel(ctx context.Context, params *cloudtrail.Dele ret := _m.Called(_ca...) var r0 *cloudtrail.DeleteChannelOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteChannelInput, ...func(*cloudtrail.Options)) (*cloudtrail.DeleteChannelOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteChannelInput, ...func(*cloudtrail.Options)) *cloudtrail.DeleteChannelOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -185,7 +204,6 @@ func (_m *CloudTrail) DeleteChannel(ctx context.Context, params *cloudtrail.Dele } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DeleteChannelInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -207,6 +225,10 @@ func (_m *CloudTrail) DeleteEventDataStore(ctx context.Context, params *cloudtra ret := _m.Called(_ca...) var r0 *cloudtrail.DeleteEventDataStoreOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteEventDataStoreInput, ...func(*cloudtrail.Options)) (*cloudtrail.DeleteEventDataStoreOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteEventDataStoreInput, ...func(*cloudtrail.Options)) *cloudtrail.DeleteEventDataStoreOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -215,7 +237,6 @@ func (_m *CloudTrail) DeleteEventDataStore(ctx context.Context, params *cloudtra } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DeleteEventDataStoreInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -237,6 +258,10 @@ func (_m *CloudTrail) DeleteResourcePolicy(ctx context.Context, params *cloudtra ret := _m.Called(_ca...) var r0 *cloudtrail.DeleteResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteResourcePolicyInput, ...func(*cloudtrail.Options)) (*cloudtrail.DeleteResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteResourcePolicyInput, ...func(*cloudtrail.Options)) *cloudtrail.DeleteResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -245,7 +270,6 @@ func (_m *CloudTrail) DeleteResourcePolicy(ctx context.Context, params *cloudtra } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DeleteResourcePolicyInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -267,6 +291,10 @@ func (_m *CloudTrail) DeleteTrail(ctx context.Context, params *cloudtrail.Delete ret := _m.Called(_ca...) var r0 *cloudtrail.DeleteTrailOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteTrailInput, ...func(*cloudtrail.Options)) (*cloudtrail.DeleteTrailOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeleteTrailInput, ...func(*cloudtrail.Options)) *cloudtrail.DeleteTrailOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -275,7 +303,6 @@ func (_m *CloudTrail) DeleteTrail(ctx context.Context, params *cloudtrail.Delete } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DeleteTrailInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -297,6 +324,10 @@ func (_m *CloudTrail) DeregisterOrganizationDelegatedAdmin(ctx context.Context, ret := _m.Called(_ca...) var r0 *cloudtrail.DeregisterOrganizationDelegatedAdminOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeregisterOrganizationDelegatedAdminInput, ...func(*cloudtrail.Options)) (*cloudtrail.DeregisterOrganizationDelegatedAdminOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DeregisterOrganizationDelegatedAdminInput, ...func(*cloudtrail.Options)) *cloudtrail.DeregisterOrganizationDelegatedAdminOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -305,7 +336,6 @@ func (_m *CloudTrail) DeregisterOrganizationDelegatedAdmin(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DeregisterOrganizationDelegatedAdminInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -327,6 +357,10 @@ func (_m *CloudTrail) DescribeQuery(ctx context.Context, params *cloudtrail.Desc ret := _m.Called(_ca...) var r0 *cloudtrail.DescribeQueryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DescribeQueryInput, ...func(*cloudtrail.Options)) (*cloudtrail.DescribeQueryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DescribeQueryInput, ...func(*cloudtrail.Options)) *cloudtrail.DescribeQueryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -335,7 +369,6 @@ func (_m *CloudTrail) DescribeQuery(ctx context.Context, params *cloudtrail.Desc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DescribeQueryInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -357,6 +390,10 @@ func (_m *CloudTrail) DescribeTrails(ctx context.Context, params *cloudtrail.Des ret := _m.Called(_ca...) var r0 *cloudtrail.DescribeTrailsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DescribeTrailsInput, ...func(*cloudtrail.Options)) (*cloudtrail.DescribeTrailsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.DescribeTrailsInput, ...func(*cloudtrail.Options)) *cloudtrail.DescribeTrailsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -365,7 +402,6 @@ func (_m *CloudTrail) DescribeTrails(ctx context.Context, params *cloudtrail.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.DescribeTrailsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -387,6 +423,10 @@ func (_m *CloudTrail) GetChannel(ctx context.Context, params *cloudtrail.GetChan ret := _m.Called(_ca...) var r0 *cloudtrail.GetChannelOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetChannelInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetChannelOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetChannelInput, ...func(*cloudtrail.Options)) *cloudtrail.GetChannelOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -395,7 +435,6 @@ func (_m *CloudTrail) GetChannel(ctx context.Context, params *cloudtrail.GetChan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetChannelInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -417,6 +456,10 @@ func (_m *CloudTrail) GetEventDataStore(ctx context.Context, params *cloudtrail. ret := _m.Called(_ca...) var r0 *cloudtrail.GetEventDataStoreOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetEventDataStoreInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetEventDataStoreOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetEventDataStoreInput, ...func(*cloudtrail.Options)) *cloudtrail.GetEventDataStoreOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -425,7 +468,6 @@ func (_m *CloudTrail) GetEventDataStore(ctx context.Context, params *cloudtrail. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetEventDataStoreInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -447,6 +489,10 @@ func (_m *CloudTrail) GetEventSelectors(ctx context.Context, params *cloudtrail. ret := _m.Called(_ca...) var r0 *cloudtrail.GetEventSelectorsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetEventSelectorsInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetEventSelectorsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetEventSelectorsInput, ...func(*cloudtrail.Options)) *cloudtrail.GetEventSelectorsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -455,7 +501,6 @@ func (_m *CloudTrail) GetEventSelectors(ctx context.Context, params *cloudtrail. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetEventSelectorsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -477,6 +522,10 @@ func (_m *CloudTrail) GetImport(ctx context.Context, params *cloudtrail.GetImpor ret := _m.Called(_ca...) var r0 *cloudtrail.GetImportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetImportInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetImportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetImportInput, ...func(*cloudtrail.Options)) *cloudtrail.GetImportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -485,7 +534,6 @@ func (_m *CloudTrail) GetImport(ctx context.Context, params *cloudtrail.GetImpor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetImportInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -507,6 +555,10 @@ func (_m *CloudTrail) GetInsightSelectors(ctx context.Context, params *cloudtrai ret := _m.Called(_ca...) var r0 *cloudtrail.GetInsightSelectorsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetInsightSelectorsInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetInsightSelectorsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetInsightSelectorsInput, ...func(*cloudtrail.Options)) *cloudtrail.GetInsightSelectorsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -515,7 +567,6 @@ func (_m *CloudTrail) GetInsightSelectors(ctx context.Context, params *cloudtrai } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetInsightSelectorsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -537,6 +588,10 @@ func (_m *CloudTrail) GetQueryResults(ctx context.Context, params *cloudtrail.Ge ret := _m.Called(_ca...) var r0 *cloudtrail.GetQueryResultsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetQueryResultsInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetQueryResultsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetQueryResultsInput, ...func(*cloudtrail.Options)) *cloudtrail.GetQueryResultsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -545,7 +600,6 @@ func (_m *CloudTrail) GetQueryResults(ctx context.Context, params *cloudtrail.Ge } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetQueryResultsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -567,6 +621,10 @@ func (_m *CloudTrail) GetResourcePolicy(ctx context.Context, params *cloudtrail. ret := _m.Called(_ca...) var r0 *cloudtrail.GetResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetResourcePolicyInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetResourcePolicyInput, ...func(*cloudtrail.Options)) *cloudtrail.GetResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -575,7 +633,6 @@ func (_m *CloudTrail) GetResourcePolicy(ctx context.Context, params *cloudtrail. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetResourcePolicyInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -597,6 +654,10 @@ func (_m *CloudTrail) GetTrail(ctx context.Context, params *cloudtrail.GetTrailI ret := _m.Called(_ca...) var r0 *cloudtrail.GetTrailOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetTrailInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetTrailOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetTrailInput, ...func(*cloudtrail.Options)) *cloudtrail.GetTrailOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -605,7 +666,6 @@ func (_m *CloudTrail) GetTrail(ctx context.Context, params *cloudtrail.GetTrailI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetTrailInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -627,6 +687,10 @@ func (_m *CloudTrail) GetTrailStatus(ctx context.Context, params *cloudtrail.Get ret := _m.Called(_ca...) var r0 *cloudtrail.GetTrailStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetTrailStatusInput, ...func(*cloudtrail.Options)) (*cloudtrail.GetTrailStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.GetTrailStatusInput, ...func(*cloudtrail.Options)) *cloudtrail.GetTrailStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -635,7 +699,6 @@ func (_m *CloudTrail) GetTrailStatus(ctx context.Context, params *cloudtrail.Get } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.GetTrailStatusInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -657,6 +720,10 @@ func (_m *CloudTrail) ListChannels(ctx context.Context, params *cloudtrail.ListC ret := _m.Called(_ca...) var r0 *cloudtrail.ListChannelsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListChannelsInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListChannelsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListChannelsInput, ...func(*cloudtrail.Options)) *cloudtrail.ListChannelsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -665,7 +732,6 @@ func (_m *CloudTrail) ListChannels(ctx context.Context, params *cloudtrail.ListC } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListChannelsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -687,6 +753,10 @@ func (_m *CloudTrail) ListEventDataStores(ctx context.Context, params *cloudtrai ret := _m.Called(_ca...) var r0 *cloudtrail.ListEventDataStoresOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListEventDataStoresInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListEventDataStoresOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListEventDataStoresInput, ...func(*cloudtrail.Options)) *cloudtrail.ListEventDataStoresOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -695,7 +765,6 @@ func (_m *CloudTrail) ListEventDataStores(ctx context.Context, params *cloudtrai } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListEventDataStoresInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -717,6 +786,10 @@ func (_m *CloudTrail) ListImportFailures(ctx context.Context, params *cloudtrail ret := _m.Called(_ca...) var r0 *cloudtrail.ListImportFailuresOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListImportFailuresInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListImportFailuresOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListImportFailuresInput, ...func(*cloudtrail.Options)) *cloudtrail.ListImportFailuresOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -725,7 +798,6 @@ func (_m *CloudTrail) ListImportFailures(ctx context.Context, params *cloudtrail } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListImportFailuresInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -747,6 +819,10 @@ func (_m *CloudTrail) ListImports(ctx context.Context, params *cloudtrail.ListIm ret := _m.Called(_ca...) var r0 *cloudtrail.ListImportsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListImportsInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListImportsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListImportsInput, ...func(*cloudtrail.Options)) *cloudtrail.ListImportsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -755,7 +831,6 @@ func (_m *CloudTrail) ListImports(ctx context.Context, params *cloudtrail.ListIm } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListImportsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -777,6 +852,10 @@ func (_m *CloudTrail) ListPublicKeys(ctx context.Context, params *cloudtrail.Lis ret := _m.Called(_ca...) var r0 *cloudtrail.ListPublicKeysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListPublicKeysInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListPublicKeysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListPublicKeysInput, ...func(*cloudtrail.Options)) *cloudtrail.ListPublicKeysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -785,7 +864,6 @@ func (_m *CloudTrail) ListPublicKeys(ctx context.Context, params *cloudtrail.Lis } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListPublicKeysInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -807,6 +885,10 @@ func (_m *CloudTrail) ListQueries(ctx context.Context, params *cloudtrail.ListQu ret := _m.Called(_ca...) var r0 *cloudtrail.ListQueriesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListQueriesInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListQueriesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListQueriesInput, ...func(*cloudtrail.Options)) *cloudtrail.ListQueriesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -815,7 +897,6 @@ func (_m *CloudTrail) ListQueries(ctx context.Context, params *cloudtrail.ListQu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListQueriesInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -837,6 +918,10 @@ func (_m *CloudTrail) ListTags(ctx context.Context, params *cloudtrail.ListTagsI ret := _m.Called(_ca...) var r0 *cloudtrail.ListTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListTagsInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListTagsInput, ...func(*cloudtrail.Options)) *cloudtrail.ListTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -845,7 +930,6 @@ func (_m *CloudTrail) ListTags(ctx context.Context, params *cloudtrail.ListTagsI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListTagsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -867,6 +951,10 @@ func (_m *CloudTrail) ListTrails(ctx context.Context, params *cloudtrail.ListTra ret := _m.Called(_ca...) var r0 *cloudtrail.ListTrailsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListTrailsInput, ...func(*cloudtrail.Options)) (*cloudtrail.ListTrailsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.ListTrailsInput, ...func(*cloudtrail.Options)) *cloudtrail.ListTrailsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -875,7 +963,6 @@ func (_m *CloudTrail) ListTrails(ctx context.Context, params *cloudtrail.ListTra } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.ListTrailsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -897,6 +984,10 @@ func (_m *CloudTrail) LookupEvents(ctx context.Context, params *cloudtrail.Looku ret := _m.Called(_ca...) var r0 *cloudtrail.LookupEventsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.LookupEventsInput, ...func(*cloudtrail.Options)) (*cloudtrail.LookupEventsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.LookupEventsInput, ...func(*cloudtrail.Options)) *cloudtrail.LookupEventsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -905,7 +996,6 @@ func (_m *CloudTrail) LookupEvents(ctx context.Context, params *cloudtrail.Looku } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.LookupEventsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -927,6 +1017,10 @@ func (_m *CloudTrail) PutEventSelectors(ctx context.Context, params *cloudtrail. ret := _m.Called(_ca...) var r0 *cloudtrail.PutEventSelectorsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.PutEventSelectorsInput, ...func(*cloudtrail.Options)) (*cloudtrail.PutEventSelectorsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.PutEventSelectorsInput, ...func(*cloudtrail.Options)) *cloudtrail.PutEventSelectorsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -935,7 +1029,6 @@ func (_m *CloudTrail) PutEventSelectors(ctx context.Context, params *cloudtrail. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.PutEventSelectorsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -957,6 +1050,10 @@ func (_m *CloudTrail) PutInsightSelectors(ctx context.Context, params *cloudtrai ret := _m.Called(_ca...) var r0 *cloudtrail.PutInsightSelectorsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.PutInsightSelectorsInput, ...func(*cloudtrail.Options)) (*cloudtrail.PutInsightSelectorsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.PutInsightSelectorsInput, ...func(*cloudtrail.Options)) *cloudtrail.PutInsightSelectorsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -965,7 +1062,6 @@ func (_m *CloudTrail) PutInsightSelectors(ctx context.Context, params *cloudtrai } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.PutInsightSelectorsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -987,6 +1083,10 @@ func (_m *CloudTrail) PutResourcePolicy(ctx context.Context, params *cloudtrail. ret := _m.Called(_ca...) var r0 *cloudtrail.PutResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.PutResourcePolicyInput, ...func(*cloudtrail.Options)) (*cloudtrail.PutResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.PutResourcePolicyInput, ...func(*cloudtrail.Options)) *cloudtrail.PutResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -995,7 +1095,6 @@ func (_m *CloudTrail) PutResourcePolicy(ctx context.Context, params *cloudtrail. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.PutResourcePolicyInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1017,6 +1116,10 @@ func (_m *CloudTrail) RegisterOrganizationDelegatedAdmin(ctx context.Context, pa ret := _m.Called(_ca...) var r0 *cloudtrail.RegisterOrganizationDelegatedAdminOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.RegisterOrganizationDelegatedAdminInput, ...func(*cloudtrail.Options)) (*cloudtrail.RegisterOrganizationDelegatedAdminOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.RegisterOrganizationDelegatedAdminInput, ...func(*cloudtrail.Options)) *cloudtrail.RegisterOrganizationDelegatedAdminOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1025,7 +1128,6 @@ func (_m *CloudTrail) RegisterOrganizationDelegatedAdmin(ctx context.Context, pa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.RegisterOrganizationDelegatedAdminInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1047,6 +1149,10 @@ func (_m *CloudTrail) RemoveTags(ctx context.Context, params *cloudtrail.RemoveT ret := _m.Called(_ca...) var r0 *cloudtrail.RemoveTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.RemoveTagsInput, ...func(*cloudtrail.Options)) (*cloudtrail.RemoveTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.RemoveTagsInput, ...func(*cloudtrail.Options)) *cloudtrail.RemoveTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1055,7 +1161,6 @@ func (_m *CloudTrail) RemoveTags(ctx context.Context, params *cloudtrail.RemoveT } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.RemoveTagsInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1077,6 +1182,10 @@ func (_m *CloudTrail) RestoreEventDataStore(ctx context.Context, params *cloudtr ret := _m.Called(_ca...) var r0 *cloudtrail.RestoreEventDataStoreOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.RestoreEventDataStoreInput, ...func(*cloudtrail.Options)) (*cloudtrail.RestoreEventDataStoreOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.RestoreEventDataStoreInput, ...func(*cloudtrail.Options)) *cloudtrail.RestoreEventDataStoreOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1085,7 +1194,6 @@ func (_m *CloudTrail) RestoreEventDataStore(ctx context.Context, params *cloudtr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.RestoreEventDataStoreInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1107,6 +1215,10 @@ func (_m *CloudTrail) StartEventDataStoreIngestion(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *cloudtrail.StartEventDataStoreIngestionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartEventDataStoreIngestionInput, ...func(*cloudtrail.Options)) (*cloudtrail.StartEventDataStoreIngestionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartEventDataStoreIngestionInput, ...func(*cloudtrail.Options)) *cloudtrail.StartEventDataStoreIngestionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1115,7 +1227,6 @@ func (_m *CloudTrail) StartEventDataStoreIngestion(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StartEventDataStoreIngestionInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1137,6 +1248,10 @@ func (_m *CloudTrail) StartImport(ctx context.Context, params *cloudtrail.StartI ret := _m.Called(_ca...) var r0 *cloudtrail.StartImportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartImportInput, ...func(*cloudtrail.Options)) (*cloudtrail.StartImportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartImportInput, ...func(*cloudtrail.Options)) *cloudtrail.StartImportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1145,7 +1260,6 @@ func (_m *CloudTrail) StartImport(ctx context.Context, params *cloudtrail.StartI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StartImportInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1167,6 +1281,10 @@ func (_m *CloudTrail) StartLogging(ctx context.Context, params *cloudtrail.Start ret := _m.Called(_ca...) var r0 *cloudtrail.StartLoggingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartLoggingInput, ...func(*cloudtrail.Options)) (*cloudtrail.StartLoggingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartLoggingInput, ...func(*cloudtrail.Options)) *cloudtrail.StartLoggingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1175,7 +1293,6 @@ func (_m *CloudTrail) StartLogging(ctx context.Context, params *cloudtrail.Start } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StartLoggingInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1197,6 +1314,10 @@ func (_m *CloudTrail) StartQuery(ctx context.Context, params *cloudtrail.StartQu ret := _m.Called(_ca...) var r0 *cloudtrail.StartQueryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartQueryInput, ...func(*cloudtrail.Options)) (*cloudtrail.StartQueryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StartQueryInput, ...func(*cloudtrail.Options)) *cloudtrail.StartQueryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1205,7 +1326,6 @@ func (_m *CloudTrail) StartQuery(ctx context.Context, params *cloudtrail.StartQu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StartQueryInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1227,6 +1347,10 @@ func (_m *CloudTrail) StopEventDataStoreIngestion(ctx context.Context, params *c ret := _m.Called(_ca...) var r0 *cloudtrail.StopEventDataStoreIngestionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StopEventDataStoreIngestionInput, ...func(*cloudtrail.Options)) (*cloudtrail.StopEventDataStoreIngestionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StopEventDataStoreIngestionInput, ...func(*cloudtrail.Options)) *cloudtrail.StopEventDataStoreIngestionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1235,7 +1359,6 @@ func (_m *CloudTrail) StopEventDataStoreIngestion(ctx context.Context, params *c } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StopEventDataStoreIngestionInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1257,6 +1380,10 @@ func (_m *CloudTrail) StopImport(ctx context.Context, params *cloudtrail.StopImp ret := _m.Called(_ca...) var r0 *cloudtrail.StopImportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StopImportInput, ...func(*cloudtrail.Options)) (*cloudtrail.StopImportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StopImportInput, ...func(*cloudtrail.Options)) *cloudtrail.StopImportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1265,7 +1392,6 @@ func (_m *CloudTrail) StopImport(ctx context.Context, params *cloudtrail.StopImp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StopImportInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1287,6 +1413,10 @@ func (_m *CloudTrail) StopLogging(ctx context.Context, params *cloudtrail.StopLo ret := _m.Called(_ca...) var r0 *cloudtrail.StopLoggingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StopLoggingInput, ...func(*cloudtrail.Options)) (*cloudtrail.StopLoggingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.StopLoggingInput, ...func(*cloudtrail.Options)) *cloudtrail.StopLoggingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1295,7 +1425,6 @@ func (_m *CloudTrail) StopLogging(ctx context.Context, params *cloudtrail.StopLo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.StopLoggingInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1317,6 +1446,10 @@ func (_m *CloudTrail) UpdateChannel(ctx context.Context, params *cloudtrail.Upda ret := _m.Called(_ca...) var r0 *cloudtrail.UpdateChannelOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.UpdateChannelInput, ...func(*cloudtrail.Options)) (*cloudtrail.UpdateChannelOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.UpdateChannelInput, ...func(*cloudtrail.Options)) *cloudtrail.UpdateChannelOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1325,7 +1458,6 @@ func (_m *CloudTrail) UpdateChannel(ctx context.Context, params *cloudtrail.Upda } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.UpdateChannelInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1347,6 +1479,10 @@ func (_m *CloudTrail) UpdateEventDataStore(ctx context.Context, params *cloudtra ret := _m.Called(_ca...) var r0 *cloudtrail.UpdateEventDataStoreOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.UpdateEventDataStoreInput, ...func(*cloudtrail.Options)) (*cloudtrail.UpdateEventDataStoreOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.UpdateEventDataStoreInput, ...func(*cloudtrail.Options)) *cloudtrail.UpdateEventDataStoreOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1355,7 +1491,6 @@ func (_m *CloudTrail) UpdateEventDataStore(ctx context.Context, params *cloudtra } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.UpdateEventDataStoreInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1377,6 +1512,10 @@ func (_m *CloudTrail) UpdateTrail(ctx context.Context, params *cloudtrail.Update ret := _m.Called(_ca...) var r0 *cloudtrail.UpdateTrailOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.UpdateTrailInput, ...func(*cloudtrail.Options)) (*cloudtrail.UpdateTrailOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudtrail.UpdateTrailInput, ...func(*cloudtrail.Options)) *cloudtrail.UpdateTrailOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1385,7 +1524,6 @@ func (_m *CloudTrail) UpdateTrail(ctx context.Context, params *cloudtrail.Update } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudtrail.UpdateTrailInput, ...func(*cloudtrail.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1394,3 +1532,17 @@ func (_m *CloudTrail) UpdateTrail(ctx context.Context, params *cloudtrail.Update return r0, r1 } + +// NewCloudTrail creates a new instance of CloudTrail. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewCloudTrail(t interface { + mock.TestingT + Cleanup(func()) +}) *CloudTrail { + mock := &CloudTrail{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/CloudWatchLogs.go b/pkg/eks/mocksv2/CloudWatchLogs.go index 32f2d834a3..2704574faf 100644 --- a/pkg/eks/mocksv2/CloudWatchLogs.go +++ b/pkg/eks/mocksv2/CloudWatchLogs.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -27,6 +27,10 @@ func (_m *CloudWatchLogs) AssociateKmsKey(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.AssociateKmsKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.AssociateKmsKeyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.AssociateKmsKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.AssociateKmsKeyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.AssociateKmsKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -35,7 +39,6 @@ func (_m *CloudWatchLogs) AssociateKmsKey(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.AssociateKmsKeyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -57,6 +60,10 @@ func (_m *CloudWatchLogs) CancelExportTask(ctx context.Context, params *cloudwat ret := _m.Called(_ca...) var r0 *cloudwatchlogs.CancelExportTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CancelExportTaskInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.CancelExportTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CancelExportTaskInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.CancelExportTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -65,7 +72,6 @@ func (_m *CloudWatchLogs) CancelExportTask(ctx context.Context, params *cloudwat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.CancelExportTaskInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -87,6 +93,10 @@ func (_m *CloudWatchLogs) CreateExportTask(ctx context.Context, params *cloudwat ret := _m.Called(_ca...) var r0 *cloudwatchlogs.CreateExportTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CreateExportTaskInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.CreateExportTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CreateExportTaskInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.CreateExportTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -95,7 +105,6 @@ func (_m *CloudWatchLogs) CreateExportTask(ctx context.Context, params *cloudwat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.CreateExportTaskInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -117,6 +126,10 @@ func (_m *CloudWatchLogs) CreateLogGroup(ctx context.Context, params *cloudwatch ret := _m.Called(_ca...) var r0 *cloudwatchlogs.CreateLogGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CreateLogGroupInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.CreateLogGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CreateLogGroupInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.CreateLogGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -125,7 +138,6 @@ func (_m *CloudWatchLogs) CreateLogGroup(ctx context.Context, params *cloudwatch } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.CreateLogGroupInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -147,6 +159,10 @@ func (_m *CloudWatchLogs) CreateLogStream(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.CreateLogStreamOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CreateLogStreamInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.CreateLogStreamOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.CreateLogStreamInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.CreateLogStreamOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -155,7 +171,6 @@ func (_m *CloudWatchLogs) CreateLogStream(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.CreateLogStreamInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -165,6 +180,39 @@ func (_m *CloudWatchLogs) CreateLogStream(ctx context.Context, params *cloudwatc return r0, r1 } +// DeleteAccountPolicy provides a mock function with given fields: ctx, params, optFns +func (_m *CloudWatchLogs) DeleteAccountPolicy(ctx context.Context, params *cloudwatchlogs.DeleteAccountPolicyInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteAccountPolicyOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *cloudwatchlogs.DeleteAccountPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteAccountPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteAccountPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteAccountPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteAccountPolicyOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*cloudwatchlogs.DeleteAccountPolicyOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteAccountPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // DeleteDataProtectionPolicy provides a mock function with given fields: ctx, params, optFns func (_m *CloudWatchLogs) DeleteDataProtectionPolicy(ctx context.Context, params *cloudwatchlogs.DeleteDataProtectionPolicyInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteDataProtectionPolicyOutput, error) { _va := make([]interface{}, len(optFns)) @@ -177,6 +225,10 @@ func (_m *CloudWatchLogs) DeleteDataProtectionPolicy(ctx context.Context, params ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteDataProtectionPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteDataProtectionPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteDataProtectionPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -185,7 +237,6 @@ func (_m *CloudWatchLogs) DeleteDataProtectionPolicy(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -207,6 +258,10 @@ func (_m *CloudWatchLogs) DeleteDestination(ctx context.Context, params *cloudwa ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteDestinationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteDestinationInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteDestinationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteDestinationInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteDestinationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -215,7 +270,6 @@ func (_m *CloudWatchLogs) DeleteDestination(ctx context.Context, params *cloudwa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteDestinationInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -237,6 +291,10 @@ func (_m *CloudWatchLogs) DeleteLogGroup(ctx context.Context, params *cloudwatch ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteLogGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteLogGroupInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteLogGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteLogGroupInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteLogGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -245,7 +303,6 @@ func (_m *CloudWatchLogs) DeleteLogGroup(ctx context.Context, params *cloudwatch } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteLogGroupInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -267,6 +324,10 @@ func (_m *CloudWatchLogs) DeleteLogStream(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteLogStreamOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteLogStreamInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteLogStreamOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteLogStreamInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteLogStreamOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -275,7 +336,6 @@ func (_m *CloudWatchLogs) DeleteLogStream(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteLogStreamInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -297,6 +357,10 @@ func (_m *CloudWatchLogs) DeleteMetricFilter(ctx context.Context, params *cloudw ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteMetricFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteMetricFilterInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteMetricFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteMetricFilterInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteMetricFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -305,7 +369,6 @@ func (_m *CloudWatchLogs) DeleteMetricFilter(ctx context.Context, params *cloudw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteMetricFilterInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -327,6 +390,10 @@ func (_m *CloudWatchLogs) DeleteQueryDefinition(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteQueryDefinitionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteQueryDefinitionInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteQueryDefinitionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteQueryDefinitionInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteQueryDefinitionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -335,7 +402,6 @@ func (_m *CloudWatchLogs) DeleteQueryDefinition(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteQueryDefinitionInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -357,6 +423,10 @@ func (_m *CloudWatchLogs) DeleteResourcePolicy(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteResourcePolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteResourcePolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -365,7 +435,6 @@ func (_m *CloudWatchLogs) DeleteResourcePolicy(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteResourcePolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -387,6 +456,10 @@ func (_m *CloudWatchLogs) DeleteRetentionPolicy(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteRetentionPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteRetentionPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteRetentionPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteRetentionPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteRetentionPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -395,7 +468,6 @@ func (_m *CloudWatchLogs) DeleteRetentionPolicy(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteRetentionPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -417,6 +489,10 @@ func (_m *CloudWatchLogs) DeleteSubscriptionFilter(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DeleteSubscriptionFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteSubscriptionFilterInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DeleteSubscriptionFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DeleteSubscriptionFilterInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DeleteSubscriptionFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -425,7 +501,6 @@ func (_m *CloudWatchLogs) DeleteSubscriptionFilter(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DeleteSubscriptionFilterInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -435,6 +510,39 @@ func (_m *CloudWatchLogs) DeleteSubscriptionFilter(ctx context.Context, params * return r0, r1 } +// DescribeAccountPolicies provides a mock function with given fields: ctx, params, optFns +func (_m *CloudWatchLogs) DescribeAccountPolicies(ctx context.Context, params *cloudwatchlogs.DescribeAccountPoliciesInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeAccountPoliciesOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *cloudwatchlogs.DescribeAccountPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeAccountPoliciesInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeAccountPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeAccountPoliciesInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeAccountPoliciesOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*cloudwatchlogs.DescribeAccountPoliciesOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeAccountPoliciesInput, ...func(*cloudwatchlogs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // DescribeDestinations provides a mock function with given fields: ctx, params, optFns func (_m *CloudWatchLogs) DescribeDestinations(ctx context.Context, params *cloudwatchlogs.DescribeDestinationsInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeDestinationsOutput, error) { _va := make([]interface{}, len(optFns)) @@ -447,6 +555,10 @@ func (_m *CloudWatchLogs) DescribeDestinations(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeDestinationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeDestinationsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeDestinationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeDestinationsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeDestinationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -455,7 +567,6 @@ func (_m *CloudWatchLogs) DescribeDestinations(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeDestinationsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -477,6 +588,10 @@ func (_m *CloudWatchLogs) DescribeExportTasks(ctx context.Context, params *cloud ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeExportTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeExportTasksInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeExportTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeExportTasksInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeExportTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -485,7 +600,6 @@ func (_m *CloudWatchLogs) DescribeExportTasks(ctx context.Context, params *cloud } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeExportTasksInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -507,6 +621,10 @@ func (_m *CloudWatchLogs) DescribeLogGroups(ctx context.Context, params *cloudwa ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeLogGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeLogGroupsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeLogGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeLogGroupsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeLogGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -515,7 +633,6 @@ func (_m *CloudWatchLogs) DescribeLogGroups(ctx context.Context, params *cloudwa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeLogGroupsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -537,6 +654,10 @@ func (_m *CloudWatchLogs) DescribeLogStreams(ctx context.Context, params *cloudw ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeLogStreamsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeLogStreamsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeLogStreamsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeLogStreamsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeLogStreamsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -545,7 +666,6 @@ func (_m *CloudWatchLogs) DescribeLogStreams(ctx context.Context, params *cloudw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeLogStreamsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -567,6 +687,10 @@ func (_m *CloudWatchLogs) DescribeMetricFilters(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeMetricFiltersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeMetricFiltersInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeMetricFiltersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeMetricFiltersInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeMetricFiltersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -575,7 +699,6 @@ func (_m *CloudWatchLogs) DescribeMetricFilters(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeMetricFiltersInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -597,6 +720,10 @@ func (_m *CloudWatchLogs) DescribeQueries(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeQueriesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeQueriesInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeQueriesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeQueriesInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeQueriesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -605,7 +732,6 @@ func (_m *CloudWatchLogs) DescribeQueries(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeQueriesInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -627,6 +753,10 @@ func (_m *CloudWatchLogs) DescribeQueryDefinitions(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeQueryDefinitionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeQueryDefinitionsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeQueryDefinitionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeQueryDefinitionsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeQueryDefinitionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -635,7 +765,6 @@ func (_m *CloudWatchLogs) DescribeQueryDefinitions(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeQueryDefinitionsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -657,6 +786,10 @@ func (_m *CloudWatchLogs) DescribeResourcePolicies(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeResourcePoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeResourcePoliciesInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeResourcePoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeResourcePoliciesInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeResourcePoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -665,7 +798,6 @@ func (_m *CloudWatchLogs) DescribeResourcePolicies(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeResourcePoliciesInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -687,6 +819,10 @@ func (_m *CloudWatchLogs) DescribeSubscriptionFilters(ctx context.Context, param ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DescribeSubscriptionFiltersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeSubscriptionFiltersInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DescribeSubscriptionFiltersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DescribeSubscriptionFiltersInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DescribeSubscriptionFiltersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -695,7 +831,6 @@ func (_m *CloudWatchLogs) DescribeSubscriptionFilters(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DescribeSubscriptionFiltersInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -717,6 +852,10 @@ func (_m *CloudWatchLogs) DisassociateKmsKey(ctx context.Context, params *cloudw ret := _m.Called(_ca...) var r0 *cloudwatchlogs.DisassociateKmsKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DisassociateKmsKeyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.DisassociateKmsKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.DisassociateKmsKeyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.DisassociateKmsKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -725,7 +864,6 @@ func (_m *CloudWatchLogs) DisassociateKmsKey(ctx context.Context, params *cloudw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.DisassociateKmsKeyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -747,6 +885,10 @@ func (_m *CloudWatchLogs) FilterLogEvents(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.FilterLogEventsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.FilterLogEventsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.FilterLogEventsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.FilterLogEventsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.FilterLogEventsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -755,7 +897,6 @@ func (_m *CloudWatchLogs) FilterLogEvents(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.FilterLogEventsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -777,6 +918,10 @@ func (_m *CloudWatchLogs) GetDataProtectionPolicy(ctx context.Context, params *c ret := _m.Called(_ca...) var r0 *cloudwatchlogs.GetDataProtectionPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.GetDataProtectionPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.GetDataProtectionPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -785,7 +930,6 @@ func (_m *CloudWatchLogs) GetDataProtectionPolicy(ctx context.Context, params *c } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.GetDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -807,6 +951,10 @@ func (_m *CloudWatchLogs) GetLogEvents(ctx context.Context, params *cloudwatchlo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.GetLogEventsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetLogEventsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.GetLogEventsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetLogEventsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.GetLogEventsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -815,7 +963,6 @@ func (_m *CloudWatchLogs) GetLogEvents(ctx context.Context, params *cloudwatchlo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.GetLogEventsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -837,6 +984,10 @@ func (_m *CloudWatchLogs) GetLogGroupFields(ctx context.Context, params *cloudwa ret := _m.Called(_ca...) var r0 *cloudwatchlogs.GetLogGroupFieldsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetLogGroupFieldsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.GetLogGroupFieldsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetLogGroupFieldsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.GetLogGroupFieldsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -845,7 +996,6 @@ func (_m *CloudWatchLogs) GetLogGroupFields(ctx context.Context, params *cloudwa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.GetLogGroupFieldsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -867,6 +1017,10 @@ func (_m *CloudWatchLogs) GetLogRecord(ctx context.Context, params *cloudwatchlo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.GetLogRecordOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetLogRecordInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.GetLogRecordOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetLogRecordInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.GetLogRecordOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -875,7 +1029,6 @@ func (_m *CloudWatchLogs) GetLogRecord(ctx context.Context, params *cloudwatchlo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.GetLogRecordInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -897,6 +1050,10 @@ func (_m *CloudWatchLogs) GetQueryResults(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.GetQueryResultsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetQueryResultsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.GetQueryResultsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.GetQueryResultsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.GetQueryResultsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -905,7 +1062,6 @@ func (_m *CloudWatchLogs) GetQueryResults(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.GetQueryResultsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -927,6 +1083,10 @@ func (_m *CloudWatchLogs) ListTagsForResource(ctx context.Context, params *cloud ret := _m.Called(_ca...) var r0 *cloudwatchlogs.ListTagsForResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.ListTagsForResourceInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListTagsForResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.ListTagsForResourceInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.ListTagsForResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -935,7 +1095,6 @@ func (_m *CloudWatchLogs) ListTagsForResource(ctx context.Context, params *cloud } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.ListTagsForResourceInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -957,6 +1116,10 @@ func (_m *CloudWatchLogs) ListTagsLogGroup(ctx context.Context, params *cloudwat ret := _m.Called(_ca...) var r0 *cloudwatchlogs.ListTagsLogGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.ListTagsLogGroupInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.ListTagsLogGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.ListTagsLogGroupInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.ListTagsLogGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -965,7 +1128,6 @@ func (_m *CloudWatchLogs) ListTagsLogGroup(ctx context.Context, params *cloudwat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.ListTagsLogGroupInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -975,6 +1137,39 @@ func (_m *CloudWatchLogs) ListTagsLogGroup(ctx context.Context, params *cloudwat return r0, r1 } +// PutAccountPolicy provides a mock function with given fields: ctx, params, optFns +func (_m *CloudWatchLogs) PutAccountPolicy(ctx context.Context, params *cloudwatchlogs.PutAccountPolicyInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutAccountPolicyOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *cloudwatchlogs.PutAccountPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutAccountPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutAccountPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutAccountPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutAccountPolicyOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*cloudwatchlogs.PutAccountPolicyOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutAccountPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // PutDataProtectionPolicy provides a mock function with given fields: ctx, params, optFns func (_m *CloudWatchLogs) PutDataProtectionPolicy(ctx context.Context, params *cloudwatchlogs.PutDataProtectionPolicyInput, optFns ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutDataProtectionPolicyOutput, error) { _va := make([]interface{}, len(optFns)) @@ -987,6 +1182,10 @@ func (_m *CloudWatchLogs) PutDataProtectionPolicy(ctx context.Context, params *c ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutDataProtectionPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutDataProtectionPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutDataProtectionPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -995,7 +1194,6 @@ func (_m *CloudWatchLogs) PutDataProtectionPolicy(ctx context.Context, params *c } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutDataProtectionPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1017,6 +1215,10 @@ func (_m *CloudWatchLogs) PutDestination(ctx context.Context, params *cloudwatch ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutDestinationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutDestinationInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutDestinationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutDestinationInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutDestinationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1025,7 +1227,6 @@ func (_m *CloudWatchLogs) PutDestination(ctx context.Context, params *cloudwatch } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutDestinationInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1047,6 +1248,10 @@ func (_m *CloudWatchLogs) PutDestinationPolicy(ctx context.Context, params *clou ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutDestinationPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutDestinationPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutDestinationPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutDestinationPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutDestinationPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1055,7 +1260,6 @@ func (_m *CloudWatchLogs) PutDestinationPolicy(ctx context.Context, params *clou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutDestinationPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1077,6 +1281,10 @@ func (_m *CloudWatchLogs) PutLogEvents(ctx context.Context, params *cloudwatchlo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutLogEventsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutLogEventsInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutLogEventsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutLogEventsInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutLogEventsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1085,7 +1293,6 @@ func (_m *CloudWatchLogs) PutLogEvents(ctx context.Context, params *cloudwatchlo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutLogEventsInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1107,6 +1314,10 @@ func (_m *CloudWatchLogs) PutMetricFilter(ctx context.Context, params *cloudwatc ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutMetricFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutMetricFilterInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutMetricFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutMetricFilterInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutMetricFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1115,7 +1326,6 @@ func (_m *CloudWatchLogs) PutMetricFilter(ctx context.Context, params *cloudwatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutMetricFilterInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1137,6 +1347,10 @@ func (_m *CloudWatchLogs) PutQueryDefinition(ctx context.Context, params *cloudw ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutQueryDefinitionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutQueryDefinitionInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutQueryDefinitionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutQueryDefinitionInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutQueryDefinitionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1145,7 +1359,6 @@ func (_m *CloudWatchLogs) PutQueryDefinition(ctx context.Context, params *cloudw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutQueryDefinitionInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1167,6 +1380,10 @@ func (_m *CloudWatchLogs) PutResourcePolicy(ctx context.Context, params *cloudwa ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutResourcePolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutResourcePolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1175,7 +1392,6 @@ func (_m *CloudWatchLogs) PutResourcePolicy(ctx context.Context, params *cloudwa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutResourcePolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1197,6 +1413,10 @@ func (_m *CloudWatchLogs) PutRetentionPolicy(ctx context.Context, params *cloudw ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutRetentionPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutRetentionPolicyInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutRetentionPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutRetentionPolicyInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutRetentionPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1205,7 +1425,6 @@ func (_m *CloudWatchLogs) PutRetentionPolicy(ctx context.Context, params *cloudw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutRetentionPolicyInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1227,6 +1446,10 @@ func (_m *CloudWatchLogs) PutSubscriptionFilter(ctx context.Context, params *clo ret := _m.Called(_ca...) var r0 *cloudwatchlogs.PutSubscriptionFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutSubscriptionFilterInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.PutSubscriptionFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.PutSubscriptionFilterInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.PutSubscriptionFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1235,7 +1458,6 @@ func (_m *CloudWatchLogs) PutSubscriptionFilter(ctx context.Context, params *clo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.PutSubscriptionFilterInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1257,6 +1479,10 @@ func (_m *CloudWatchLogs) StartQuery(ctx context.Context, params *cloudwatchlogs ret := _m.Called(_ca...) var r0 *cloudwatchlogs.StartQueryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.StartQueryInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.StartQueryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.StartQueryInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.StartQueryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1265,7 +1491,6 @@ func (_m *CloudWatchLogs) StartQuery(ctx context.Context, params *cloudwatchlogs } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.StartQueryInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1287,6 +1512,10 @@ func (_m *CloudWatchLogs) StopQuery(ctx context.Context, params *cloudwatchlogs. ret := _m.Called(_ca...) var r0 *cloudwatchlogs.StopQueryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.StopQueryInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.StopQueryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.StopQueryInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.StopQueryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1295,7 +1524,6 @@ func (_m *CloudWatchLogs) StopQuery(ctx context.Context, params *cloudwatchlogs. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.StopQueryInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1317,6 +1545,10 @@ func (_m *CloudWatchLogs) TagLogGroup(ctx context.Context, params *cloudwatchlog ret := _m.Called(_ca...) var r0 *cloudwatchlogs.TagLogGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.TagLogGroupInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.TagLogGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.TagLogGroupInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.TagLogGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1325,7 +1557,6 @@ func (_m *CloudWatchLogs) TagLogGroup(ctx context.Context, params *cloudwatchlog } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.TagLogGroupInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1347,6 +1578,10 @@ func (_m *CloudWatchLogs) TagResource(ctx context.Context, params *cloudwatchlog ret := _m.Called(_ca...) var r0 *cloudwatchlogs.TagResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.TagResourceInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.TagResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.TagResourceInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.TagResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1355,7 +1590,6 @@ func (_m *CloudWatchLogs) TagResource(ctx context.Context, params *cloudwatchlog } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.TagResourceInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1377,6 +1611,10 @@ func (_m *CloudWatchLogs) TestMetricFilter(ctx context.Context, params *cloudwat ret := _m.Called(_ca...) var r0 *cloudwatchlogs.TestMetricFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.TestMetricFilterInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.TestMetricFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.TestMetricFilterInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.TestMetricFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1385,7 +1623,6 @@ func (_m *CloudWatchLogs) TestMetricFilter(ctx context.Context, params *cloudwat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.TestMetricFilterInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1407,6 +1644,10 @@ func (_m *CloudWatchLogs) UntagLogGroup(ctx context.Context, params *cloudwatchl ret := _m.Called(_ca...) var r0 *cloudwatchlogs.UntagLogGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.UntagLogGroupInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.UntagLogGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.UntagLogGroupInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.UntagLogGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1415,7 +1656,6 @@ func (_m *CloudWatchLogs) UntagLogGroup(ctx context.Context, params *cloudwatchl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.UntagLogGroupInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1437,6 +1677,10 @@ func (_m *CloudWatchLogs) UntagResource(ctx context.Context, params *cloudwatchl ret := _m.Called(_ca...) var r0 *cloudwatchlogs.UntagResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.UntagResourceInput, ...func(*cloudwatchlogs.Options)) (*cloudwatchlogs.UntagResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *cloudwatchlogs.UntagResourceInput, ...func(*cloudwatchlogs.Options)) *cloudwatchlogs.UntagResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1445,7 +1689,6 @@ func (_m *CloudWatchLogs) UntagResource(ctx context.Context, params *cloudwatchl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *cloudwatchlogs.UntagResourceInput, ...func(*cloudwatchlogs.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1454,3 +1697,17 @@ func (_m *CloudWatchLogs) UntagResource(ctx context.Context, params *cloudwatchl return r0, r1 } + +// NewCloudWatchLogs creates a new instance of CloudWatchLogs. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewCloudWatchLogs(t interface { + mock.TestingT + Cleanup(func()) +}) *CloudWatchLogs { + mock := &CloudWatchLogs{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/CredentialsProvider.go b/pkg/eks/mocksv2/CredentialsProvider.go new file mode 100644 index 0000000000..e90646c8a4 --- /dev/null +++ b/pkg/eks/mocksv2/CredentialsProvider.go @@ -0,0 +1,54 @@ +// Code generated by mockery v2.32.2. DO NOT EDIT. + +package mocksv2 + +import ( + context "context" + + aws "github.com/aws/aws-sdk-go-v2/aws" + + mock "github.com/stretchr/testify/mock" +) + +// CredentialsProvider is an autogenerated mock type for the CredentialsProvider type +type CredentialsProvider struct { + mock.Mock +} + +// Retrieve provides a mock function with given fields: ctx +func (_m *CredentialsProvider) Retrieve(ctx context.Context) (aws.Credentials, error) { + ret := _m.Called(ctx) + + var r0 aws.Credentials + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) (aws.Credentials, error)); ok { + return rf(ctx) + } + if rf, ok := ret.Get(0).(func(context.Context) aws.Credentials); ok { + r0 = rf(ctx) + } else { + r0 = ret.Get(0).(aws.Credentials) + } + + if rf, ok := ret.Get(1).(func(context.Context) error); ok { + r1 = rf(ctx) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// NewCredentialsProvider creates a new instance of CredentialsProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewCredentialsProvider(t interface { + mock.TestingT + Cleanup(func()) +}) *CredentialsProvider { + mock := &CredentialsProvider{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/EC2.go b/pkg/eks/mocksv2/EC2.go index d708ca020d..2da8e309f6 100644 --- a/pkg/eks/mocksv2/EC2.go +++ b/pkg/eks/mocksv2/EC2.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *EC2) AcceptReservedInstancesExchangeQuote(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.AcceptReservedInstancesExchangeQuoteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptReservedInstancesExchangeQuoteInput, ...func(*ec2.Options)) (*ec2.AcceptReservedInstancesExchangeQuoteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptReservedInstancesExchangeQuoteInput, ...func(*ec2.Options)) *ec2.AcceptReservedInstancesExchangeQuoteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *EC2) AcceptReservedInstancesExchangeQuote(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AcceptReservedInstancesExchangeQuoteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *EC2) AcceptTransitGatewayMulticastDomainAssociations(ctx context.Conte ret := _m.Called(_ca...) var r0 *ec2.AcceptTransitGatewayMulticastDomainAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) (*ec2.AcceptTransitGatewayMulticastDomainAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) *ec2.AcceptTransitGatewayMulticastDomainAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *EC2) AcceptTransitGatewayMulticastDomainAssociations(ctx context.Conte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AcceptTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *EC2) AcceptTransitGatewayPeeringAttachment(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.AcceptTransitGatewayPeeringAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) (*ec2.AcceptTransitGatewayPeeringAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) *ec2.AcceptTransitGatewayPeeringAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *EC2) AcceptTransitGatewayPeeringAttachment(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AcceptTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *EC2) AcceptTransitGatewayVpcAttachment(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.AcceptTransitGatewayVpcAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) (*ec2.AcceptTransitGatewayVpcAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) *ec2.AcceptTransitGatewayVpcAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *EC2) AcceptTransitGatewayVpcAttachment(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AcceptTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *EC2) AcceptVpcEndpointConnections(ctx context.Context, params *ec2.Acc ret := _m.Called(_ca...) var r0 *ec2.AcceptVpcEndpointConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptVpcEndpointConnectionsInput, ...func(*ec2.Options)) (*ec2.AcceptVpcEndpointConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptVpcEndpointConnectionsInput, ...func(*ec2.Options)) *ec2.AcceptVpcEndpointConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *EC2) AcceptVpcEndpointConnections(ctx context.Context, params *ec2.Acc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AcceptVpcEndpointConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *EC2) AcceptVpcPeeringConnection(ctx context.Context, params *ec2.Accep ret := _m.Called(_ca...) var r0 *ec2.AcceptVpcPeeringConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptVpcPeeringConnectionInput, ...func(*ec2.Options)) (*ec2.AcceptVpcPeeringConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AcceptVpcPeeringConnectionInput, ...func(*ec2.Options)) *ec2.AcceptVpcPeeringConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *EC2) AcceptVpcPeeringConnection(ctx context.Context, params *ec2.Accep } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AcceptVpcPeeringConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *EC2) AdvertiseByoipCidr(ctx context.Context, params *ec2.AdvertiseByoi ret := _m.Called(_ca...) var r0 *ec2.AdvertiseByoipCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AdvertiseByoipCidrInput, ...func(*ec2.Options)) (*ec2.AdvertiseByoipCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AdvertiseByoipCidrInput, ...func(*ec2.Options)) *ec2.AdvertiseByoipCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *EC2) AdvertiseByoipCidr(ctx context.Context, params *ec2.AdvertiseByoi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AdvertiseByoipCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *EC2) AllocateAddress(ctx context.Context, params *ec2.AllocateAddressI ret := _m.Called(_ca...) var r0 *ec2.AllocateAddressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AllocateAddressInput, ...func(*ec2.Options)) (*ec2.AllocateAddressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AllocateAddressInput, ...func(*ec2.Options)) *ec2.AllocateAddressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *EC2) AllocateAddress(ctx context.Context, params *ec2.AllocateAddressI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AllocateAddressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *EC2) AllocateHosts(ctx context.Context, params *ec2.AllocateHostsInput ret := _m.Called(_ca...) var r0 *ec2.AllocateHostsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AllocateHostsInput, ...func(*ec2.Options)) (*ec2.AllocateHostsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AllocateHostsInput, ...func(*ec2.Options)) *ec2.AllocateHostsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *EC2) AllocateHosts(ctx context.Context, params *ec2.AllocateHostsInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AllocateHostsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *EC2) AllocateIpamPoolCidr(ctx context.Context, params *ec2.AllocateIpa ret := _m.Called(_ca...) var r0 *ec2.AllocateIpamPoolCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AllocateIpamPoolCidrInput, ...func(*ec2.Options)) (*ec2.AllocateIpamPoolCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AllocateIpamPoolCidrInput, ...func(*ec2.Options)) *ec2.AllocateIpamPoolCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *EC2) AllocateIpamPoolCidr(ctx context.Context, params *ec2.AllocateIpa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AllocateIpamPoolCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *EC2) ApplySecurityGroupsToClientVpnTargetNetwork(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.ApplySecurityGroupsToClientVpnTargetNetworkOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ApplySecurityGroupsToClientVpnTargetNetworkInput, ...func(*ec2.Options)) (*ec2.ApplySecurityGroupsToClientVpnTargetNetworkOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ApplySecurityGroupsToClientVpnTargetNetworkInput, ...func(*ec2.Options)) *ec2.ApplySecurityGroupsToClientVpnTargetNetworkOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *EC2) ApplySecurityGroupsToClientVpnTargetNetwork(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ApplySecurityGroupsToClientVpnTargetNetworkInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *EC2) AssignIpv6Addresses(ctx context.Context, params *ec2.AssignIpv6Ad ret := _m.Called(_ca...) var r0 *ec2.AssignIpv6AddressesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssignIpv6AddressesInput, ...func(*ec2.Options)) (*ec2.AssignIpv6AddressesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssignIpv6AddressesInput, ...func(*ec2.Options)) *ec2.AssignIpv6AddressesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *EC2) AssignIpv6Addresses(ctx context.Context, params *ec2.AssignIpv6Ad } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssignIpv6AddressesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *EC2) AssignPrivateIpAddresses(ctx context.Context, params *ec2.AssignP ret := _m.Called(_ca...) var r0 *ec2.AssignPrivateIpAddressesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssignPrivateIpAddressesInput, ...func(*ec2.Options)) (*ec2.AssignPrivateIpAddressesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssignPrivateIpAddressesInput, ...func(*ec2.Options)) *ec2.AssignPrivateIpAddressesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *EC2) AssignPrivateIpAddresses(ctx context.Context, params *ec2.AssignP } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssignPrivateIpAddressesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *EC2) AssociateAddress(ctx context.Context, params *ec2.AssociateAddres ret := _m.Called(_ca...) var r0 *ec2.AssociateAddressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateAddressInput, ...func(*ec2.Options)) (*ec2.AssociateAddressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateAddressInput, ...func(*ec2.Options)) *ec2.AssociateAddressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *EC2) AssociateAddress(ctx context.Context, params *ec2.AssociateAddres } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateAddressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *EC2) AssociateClientVpnTargetNetwork(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.AssociateClientVpnTargetNetworkOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateClientVpnTargetNetworkInput, ...func(*ec2.Options)) (*ec2.AssociateClientVpnTargetNetworkOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateClientVpnTargetNetworkInput, ...func(*ec2.Options)) *ec2.AssociateClientVpnTargetNetworkOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *EC2) AssociateClientVpnTargetNetwork(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateClientVpnTargetNetworkInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *EC2) AssociateDhcpOptions(ctx context.Context, params *ec2.AssociateDh ret := _m.Called(_ca...) var r0 *ec2.AssociateDhcpOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateDhcpOptionsInput, ...func(*ec2.Options)) (*ec2.AssociateDhcpOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateDhcpOptionsInput, ...func(*ec2.Options)) *ec2.AssociateDhcpOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *EC2) AssociateDhcpOptions(ctx context.Context, params *ec2.AssociateDh } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateDhcpOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *EC2) AssociateEnclaveCertificateIamRole(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.AssociateEnclaveCertificateIamRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateEnclaveCertificateIamRoleInput, ...func(*ec2.Options)) (*ec2.AssociateEnclaveCertificateIamRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateEnclaveCertificateIamRoleInput, ...func(*ec2.Options)) *ec2.AssociateEnclaveCertificateIamRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *EC2) AssociateEnclaveCertificateIamRole(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateEnclaveCertificateIamRoleInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *EC2) AssociateIamInstanceProfile(ctx context.Context, params *ec2.Asso ret := _m.Called(_ca...) var r0 *ec2.AssociateIamInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateIamInstanceProfileInput, ...func(*ec2.Options)) (*ec2.AssociateIamInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateIamInstanceProfileInput, ...func(*ec2.Options)) *ec2.AssociateIamInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *EC2) AssociateIamInstanceProfile(ctx context.Context, params *ec2.Asso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateIamInstanceProfileInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *EC2) AssociateInstanceEventWindow(ctx context.Context, params *ec2.Ass ret := _m.Called(_ca...) var r0 *ec2.AssociateInstanceEventWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateInstanceEventWindowInput, ...func(*ec2.Options)) (*ec2.AssociateInstanceEventWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateInstanceEventWindowInput, ...func(*ec2.Options)) *ec2.AssociateInstanceEventWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *EC2) AssociateInstanceEventWindow(ctx context.Context, params *ec2.Ass } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateInstanceEventWindowInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *EC2) AssociateRouteTable(ctx context.Context, params *ec2.AssociateRou ret := _m.Called(_ca...) var r0 *ec2.AssociateRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateRouteTableInput, ...func(*ec2.Options)) (*ec2.AssociateRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateRouteTableInput, ...func(*ec2.Options)) *ec2.AssociateRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *EC2) AssociateRouteTable(ctx context.Context, params *ec2.AssociateRou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *EC2) AssociateSubnetCidrBlock(ctx context.Context, params *ec2.Associa ret := _m.Called(_ca...) var r0 *ec2.AssociateSubnetCidrBlockOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateSubnetCidrBlockInput, ...func(*ec2.Options)) (*ec2.AssociateSubnetCidrBlockOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateSubnetCidrBlockInput, ...func(*ec2.Options)) *ec2.AssociateSubnetCidrBlockOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *EC2) AssociateSubnetCidrBlock(ctx context.Context, params *ec2.Associa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateSubnetCidrBlockInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *EC2) AssociateTransitGatewayMulticastDomain(ctx context.Context, param ret := _m.Called(_ca...) var r0 *ec2.AssociateTransitGatewayMulticastDomainOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) (*ec2.AssociateTransitGatewayMulticastDomainOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) *ec2.AssociateTransitGatewayMulticastDomainOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *EC2) AssociateTransitGatewayMulticastDomain(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *EC2) AssociateTransitGatewayRouteTable(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.AssociateTransitGatewayRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateTransitGatewayRouteTableInput, ...func(*ec2.Options)) (*ec2.AssociateTransitGatewayRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateTransitGatewayRouteTableInput, ...func(*ec2.Options)) *ec2.AssociateTransitGatewayRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *EC2) AssociateTransitGatewayRouteTable(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateTransitGatewayRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *EC2) AssociateTrunkInterface(ctx context.Context, params *ec2.Associat ret := _m.Called(_ca...) var r0 *ec2.AssociateTrunkInterfaceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateTrunkInterfaceInput, ...func(*ec2.Options)) (*ec2.AssociateTrunkInterfaceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateTrunkInterfaceInput, ...func(*ec2.Options)) *ec2.AssociateTrunkInterfaceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *EC2) AssociateTrunkInterface(ctx context.Context, params *ec2.Associat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateTrunkInterfaceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *EC2) AssociateVpcCidrBlock(ctx context.Context, params *ec2.AssociateV ret := _m.Called(_ca...) var r0 *ec2.AssociateVpcCidrBlockOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateVpcCidrBlockInput, ...func(*ec2.Options)) (*ec2.AssociateVpcCidrBlockOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AssociateVpcCidrBlockInput, ...func(*ec2.Options)) *ec2.AssociateVpcCidrBlockOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *EC2) AssociateVpcCidrBlock(ctx context.Context, params *ec2.AssociateV } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AssociateVpcCidrBlockInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *EC2) AttachClassicLinkVpc(ctx context.Context, params *ec2.AttachClass ret := _m.Called(_ca...) var r0 *ec2.AttachClassicLinkVpcOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachClassicLinkVpcInput, ...func(*ec2.Options)) (*ec2.AttachClassicLinkVpcOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachClassicLinkVpcInput, ...func(*ec2.Options)) *ec2.AttachClassicLinkVpcOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *EC2) AttachClassicLinkVpc(ctx context.Context, params *ec2.AttachClass } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AttachClassicLinkVpcInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -806,6 +884,10 @@ func (_m *EC2) AttachInternetGateway(ctx context.Context, params *ec2.AttachInte ret := _m.Called(_ca...) var r0 *ec2.AttachInternetGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachInternetGatewayInput, ...func(*ec2.Options)) (*ec2.AttachInternetGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachInternetGatewayInput, ...func(*ec2.Options)) *ec2.AttachInternetGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -814,7 +896,6 @@ func (_m *EC2) AttachInternetGateway(ctx context.Context, params *ec2.AttachInte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AttachInternetGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -836,6 +917,10 @@ func (_m *EC2) AttachNetworkInterface(ctx context.Context, params *ec2.AttachNet ret := _m.Called(_ca...) var r0 *ec2.AttachNetworkInterfaceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachNetworkInterfaceInput, ...func(*ec2.Options)) (*ec2.AttachNetworkInterfaceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachNetworkInterfaceInput, ...func(*ec2.Options)) *ec2.AttachNetworkInterfaceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -844,7 +929,6 @@ func (_m *EC2) AttachNetworkInterface(ctx context.Context, params *ec2.AttachNet } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AttachNetworkInterfaceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -866,6 +950,10 @@ func (_m *EC2) AttachVolume(ctx context.Context, params *ec2.AttachVolumeInput, ret := _m.Called(_ca...) var r0 *ec2.AttachVolumeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachVolumeInput, ...func(*ec2.Options)) (*ec2.AttachVolumeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachVolumeInput, ...func(*ec2.Options)) *ec2.AttachVolumeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -874,7 +962,6 @@ func (_m *EC2) AttachVolume(ctx context.Context, params *ec2.AttachVolumeInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AttachVolumeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -896,6 +983,10 @@ func (_m *EC2) AttachVpnGateway(ctx context.Context, params *ec2.AttachVpnGatewa ret := _m.Called(_ca...) var r0 *ec2.AttachVpnGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachVpnGatewayInput, ...func(*ec2.Options)) (*ec2.AttachVpnGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AttachVpnGatewayInput, ...func(*ec2.Options)) *ec2.AttachVpnGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -904,7 +995,6 @@ func (_m *EC2) AttachVpnGateway(ctx context.Context, params *ec2.AttachVpnGatewa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AttachVpnGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -926,6 +1016,10 @@ func (_m *EC2) AuthorizeClientVpnIngress(ctx context.Context, params *ec2.Author ret := _m.Called(_ca...) var r0 *ec2.AuthorizeClientVpnIngressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AuthorizeClientVpnIngressInput, ...func(*ec2.Options)) (*ec2.AuthorizeClientVpnIngressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AuthorizeClientVpnIngressInput, ...func(*ec2.Options)) *ec2.AuthorizeClientVpnIngressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -934,7 +1028,6 @@ func (_m *EC2) AuthorizeClientVpnIngress(ctx context.Context, params *ec2.Author } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AuthorizeClientVpnIngressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -956,6 +1049,10 @@ func (_m *EC2) AuthorizeSecurityGroupEgress(ctx context.Context, params *ec2.Aut ret := _m.Called(_ca...) var r0 *ec2.AuthorizeSecurityGroupEgressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AuthorizeSecurityGroupEgressInput, ...func(*ec2.Options)) (*ec2.AuthorizeSecurityGroupEgressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AuthorizeSecurityGroupEgressInput, ...func(*ec2.Options)) *ec2.AuthorizeSecurityGroupEgressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -964,7 +1061,6 @@ func (_m *EC2) AuthorizeSecurityGroupEgress(ctx context.Context, params *ec2.Aut } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AuthorizeSecurityGroupEgressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -986,6 +1082,10 @@ func (_m *EC2) AuthorizeSecurityGroupIngress(ctx context.Context, params *ec2.Au ret := _m.Called(_ca...) var r0 *ec2.AuthorizeSecurityGroupIngressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.AuthorizeSecurityGroupIngressInput, ...func(*ec2.Options)) (*ec2.AuthorizeSecurityGroupIngressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.AuthorizeSecurityGroupIngressInput, ...func(*ec2.Options)) *ec2.AuthorizeSecurityGroupIngressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -994,7 +1094,6 @@ func (_m *EC2) AuthorizeSecurityGroupIngress(ctx context.Context, params *ec2.Au } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.AuthorizeSecurityGroupIngressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1016,6 +1115,10 @@ func (_m *EC2) BundleInstance(ctx context.Context, params *ec2.BundleInstanceInp ret := _m.Called(_ca...) var r0 *ec2.BundleInstanceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.BundleInstanceInput, ...func(*ec2.Options)) (*ec2.BundleInstanceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.BundleInstanceInput, ...func(*ec2.Options)) *ec2.BundleInstanceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1024,7 +1127,6 @@ func (_m *EC2) BundleInstance(ctx context.Context, params *ec2.BundleInstanceInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.BundleInstanceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1046,6 +1148,10 @@ func (_m *EC2) CancelBundleTask(ctx context.Context, params *ec2.CancelBundleTas ret := _m.Called(_ca...) var r0 *ec2.CancelBundleTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelBundleTaskInput, ...func(*ec2.Options)) (*ec2.CancelBundleTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelBundleTaskInput, ...func(*ec2.Options)) *ec2.CancelBundleTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1054,7 +1160,6 @@ func (_m *EC2) CancelBundleTask(ctx context.Context, params *ec2.CancelBundleTas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelBundleTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1076,6 +1181,10 @@ func (_m *EC2) CancelCapacityReservation(ctx context.Context, params *ec2.Cancel ret := _m.Called(_ca...) var r0 *ec2.CancelCapacityReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelCapacityReservationInput, ...func(*ec2.Options)) (*ec2.CancelCapacityReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelCapacityReservationInput, ...func(*ec2.Options)) *ec2.CancelCapacityReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1084,7 +1193,6 @@ func (_m *EC2) CancelCapacityReservation(ctx context.Context, params *ec2.Cancel } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelCapacityReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1106,6 +1214,10 @@ func (_m *EC2) CancelCapacityReservationFleets(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.CancelCapacityReservationFleetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelCapacityReservationFleetsInput, ...func(*ec2.Options)) (*ec2.CancelCapacityReservationFleetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelCapacityReservationFleetsInput, ...func(*ec2.Options)) *ec2.CancelCapacityReservationFleetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1114,7 +1226,6 @@ func (_m *EC2) CancelCapacityReservationFleets(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelCapacityReservationFleetsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1136,6 +1247,10 @@ func (_m *EC2) CancelConversionTask(ctx context.Context, params *ec2.CancelConve ret := _m.Called(_ca...) var r0 *ec2.CancelConversionTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelConversionTaskInput, ...func(*ec2.Options)) (*ec2.CancelConversionTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelConversionTaskInput, ...func(*ec2.Options)) *ec2.CancelConversionTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1144,7 +1259,6 @@ func (_m *EC2) CancelConversionTask(ctx context.Context, params *ec2.CancelConve } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelConversionTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1166,6 +1280,10 @@ func (_m *EC2) CancelExportTask(ctx context.Context, params *ec2.CancelExportTas ret := _m.Called(_ca...) var r0 *ec2.CancelExportTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelExportTaskInput, ...func(*ec2.Options)) (*ec2.CancelExportTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelExportTaskInput, ...func(*ec2.Options)) *ec2.CancelExportTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1174,7 +1292,6 @@ func (_m *EC2) CancelExportTask(ctx context.Context, params *ec2.CancelExportTas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelExportTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1196,6 +1313,10 @@ func (_m *EC2) CancelImportTask(ctx context.Context, params *ec2.CancelImportTas ret := _m.Called(_ca...) var r0 *ec2.CancelImportTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelImportTaskInput, ...func(*ec2.Options)) (*ec2.CancelImportTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelImportTaskInput, ...func(*ec2.Options)) *ec2.CancelImportTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1204,7 +1325,6 @@ func (_m *EC2) CancelImportTask(ctx context.Context, params *ec2.CancelImportTas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelImportTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1226,6 +1346,10 @@ func (_m *EC2) CancelReservedInstancesListing(ctx context.Context, params *ec2.C ret := _m.Called(_ca...) var r0 *ec2.CancelReservedInstancesListingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelReservedInstancesListingInput, ...func(*ec2.Options)) (*ec2.CancelReservedInstancesListingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelReservedInstancesListingInput, ...func(*ec2.Options)) *ec2.CancelReservedInstancesListingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1234,7 +1358,6 @@ func (_m *EC2) CancelReservedInstancesListing(ctx context.Context, params *ec2.C } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelReservedInstancesListingInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1256,6 +1379,10 @@ func (_m *EC2) CancelSpotFleetRequests(ctx context.Context, params *ec2.CancelSp ret := _m.Called(_ca...) var r0 *ec2.CancelSpotFleetRequestsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelSpotFleetRequestsInput, ...func(*ec2.Options)) (*ec2.CancelSpotFleetRequestsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelSpotFleetRequestsInput, ...func(*ec2.Options)) *ec2.CancelSpotFleetRequestsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1264,7 +1391,6 @@ func (_m *EC2) CancelSpotFleetRequests(ctx context.Context, params *ec2.CancelSp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelSpotFleetRequestsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1286,6 +1412,10 @@ func (_m *EC2) CancelSpotInstanceRequests(ctx context.Context, params *ec2.Cance ret := _m.Called(_ca...) var r0 *ec2.CancelSpotInstanceRequestsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelSpotInstanceRequestsInput, ...func(*ec2.Options)) (*ec2.CancelSpotInstanceRequestsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CancelSpotInstanceRequestsInput, ...func(*ec2.Options)) *ec2.CancelSpotInstanceRequestsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1294,7 +1424,6 @@ func (_m *EC2) CancelSpotInstanceRequests(ctx context.Context, params *ec2.Cance } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CancelSpotInstanceRequestsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1316,6 +1445,10 @@ func (_m *EC2) ConfirmProductInstance(ctx context.Context, params *ec2.ConfirmPr ret := _m.Called(_ca...) var r0 *ec2.ConfirmProductInstanceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ConfirmProductInstanceInput, ...func(*ec2.Options)) (*ec2.ConfirmProductInstanceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ConfirmProductInstanceInput, ...func(*ec2.Options)) *ec2.ConfirmProductInstanceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1324,7 +1457,6 @@ func (_m *EC2) ConfirmProductInstance(ctx context.Context, params *ec2.ConfirmPr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ConfirmProductInstanceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1346,6 +1478,10 @@ func (_m *EC2) CopyFpgaImage(ctx context.Context, params *ec2.CopyFpgaImageInput ret := _m.Called(_ca...) var r0 *ec2.CopyFpgaImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CopyFpgaImageInput, ...func(*ec2.Options)) (*ec2.CopyFpgaImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CopyFpgaImageInput, ...func(*ec2.Options)) *ec2.CopyFpgaImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1354,7 +1490,6 @@ func (_m *EC2) CopyFpgaImage(ctx context.Context, params *ec2.CopyFpgaImageInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CopyFpgaImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1376,6 +1511,10 @@ func (_m *EC2) CopyImage(ctx context.Context, params *ec2.CopyImageInput, optFns ret := _m.Called(_ca...) var r0 *ec2.CopyImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CopyImageInput, ...func(*ec2.Options)) (*ec2.CopyImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CopyImageInput, ...func(*ec2.Options)) *ec2.CopyImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1384,7 +1523,6 @@ func (_m *EC2) CopyImage(ctx context.Context, params *ec2.CopyImageInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CopyImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1406,6 +1544,10 @@ func (_m *EC2) CopySnapshot(ctx context.Context, params *ec2.CopySnapshotInput, ret := _m.Called(_ca...) var r0 *ec2.CopySnapshotOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CopySnapshotInput, ...func(*ec2.Options)) (*ec2.CopySnapshotOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CopySnapshotInput, ...func(*ec2.Options)) *ec2.CopySnapshotOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1414,7 +1556,6 @@ func (_m *EC2) CopySnapshot(ctx context.Context, params *ec2.CopySnapshotInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CopySnapshotInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1436,6 +1577,10 @@ func (_m *EC2) CreateCapacityReservation(ctx context.Context, params *ec2.Create ret := _m.Called(_ca...) var r0 *ec2.CreateCapacityReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCapacityReservationInput, ...func(*ec2.Options)) (*ec2.CreateCapacityReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCapacityReservationInput, ...func(*ec2.Options)) *ec2.CreateCapacityReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1444,7 +1589,6 @@ func (_m *EC2) CreateCapacityReservation(ctx context.Context, params *ec2.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateCapacityReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1466,6 +1610,10 @@ func (_m *EC2) CreateCapacityReservationFleet(ctx context.Context, params *ec2.C ret := _m.Called(_ca...) var r0 *ec2.CreateCapacityReservationFleetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCapacityReservationFleetInput, ...func(*ec2.Options)) (*ec2.CreateCapacityReservationFleetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCapacityReservationFleetInput, ...func(*ec2.Options)) *ec2.CreateCapacityReservationFleetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1474,7 +1622,6 @@ func (_m *EC2) CreateCapacityReservationFleet(ctx context.Context, params *ec2.C } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateCapacityReservationFleetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1496,6 +1643,10 @@ func (_m *EC2) CreateCarrierGateway(ctx context.Context, params *ec2.CreateCarri ret := _m.Called(_ca...) var r0 *ec2.CreateCarrierGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCarrierGatewayInput, ...func(*ec2.Options)) (*ec2.CreateCarrierGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCarrierGatewayInput, ...func(*ec2.Options)) *ec2.CreateCarrierGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1504,7 +1655,6 @@ func (_m *EC2) CreateCarrierGateway(ctx context.Context, params *ec2.CreateCarri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateCarrierGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1526,6 +1676,10 @@ func (_m *EC2) CreateClientVpnEndpoint(ctx context.Context, params *ec2.CreateCl ret := _m.Called(_ca...) var r0 *ec2.CreateClientVpnEndpointOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateClientVpnEndpointInput, ...func(*ec2.Options)) (*ec2.CreateClientVpnEndpointOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateClientVpnEndpointInput, ...func(*ec2.Options)) *ec2.CreateClientVpnEndpointOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1534,7 +1688,6 @@ func (_m *EC2) CreateClientVpnEndpoint(ctx context.Context, params *ec2.CreateCl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateClientVpnEndpointInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1556,6 +1709,10 @@ func (_m *EC2) CreateClientVpnRoute(ctx context.Context, params *ec2.CreateClien ret := _m.Called(_ca...) var r0 *ec2.CreateClientVpnRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateClientVpnRouteInput, ...func(*ec2.Options)) (*ec2.CreateClientVpnRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateClientVpnRouteInput, ...func(*ec2.Options)) *ec2.CreateClientVpnRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1564,7 +1721,6 @@ func (_m *EC2) CreateClientVpnRoute(ctx context.Context, params *ec2.CreateClien } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateClientVpnRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1586,6 +1742,10 @@ func (_m *EC2) CreateCustomerGateway(ctx context.Context, params *ec2.CreateCust ret := _m.Called(_ca...) var r0 *ec2.CreateCustomerGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCustomerGatewayInput, ...func(*ec2.Options)) (*ec2.CreateCustomerGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateCustomerGatewayInput, ...func(*ec2.Options)) *ec2.CreateCustomerGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1594,7 +1754,6 @@ func (_m *EC2) CreateCustomerGateway(ctx context.Context, params *ec2.CreateCust } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateCustomerGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1616,6 +1775,10 @@ func (_m *EC2) CreateDefaultSubnet(ctx context.Context, params *ec2.CreateDefaul ret := _m.Called(_ca...) var r0 *ec2.CreateDefaultSubnetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateDefaultSubnetInput, ...func(*ec2.Options)) (*ec2.CreateDefaultSubnetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateDefaultSubnetInput, ...func(*ec2.Options)) *ec2.CreateDefaultSubnetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1624,7 +1787,6 @@ func (_m *EC2) CreateDefaultSubnet(ctx context.Context, params *ec2.CreateDefaul } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateDefaultSubnetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1646,6 +1808,10 @@ func (_m *EC2) CreateDefaultVpc(ctx context.Context, params *ec2.CreateDefaultVp ret := _m.Called(_ca...) var r0 *ec2.CreateDefaultVpcOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateDefaultVpcInput, ...func(*ec2.Options)) (*ec2.CreateDefaultVpcOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateDefaultVpcInput, ...func(*ec2.Options)) *ec2.CreateDefaultVpcOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1654,7 +1820,6 @@ func (_m *EC2) CreateDefaultVpc(ctx context.Context, params *ec2.CreateDefaultVp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateDefaultVpcInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1676,6 +1841,10 @@ func (_m *EC2) CreateDhcpOptions(ctx context.Context, params *ec2.CreateDhcpOpti ret := _m.Called(_ca...) var r0 *ec2.CreateDhcpOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateDhcpOptionsInput, ...func(*ec2.Options)) (*ec2.CreateDhcpOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateDhcpOptionsInput, ...func(*ec2.Options)) *ec2.CreateDhcpOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1684,7 +1853,6 @@ func (_m *EC2) CreateDhcpOptions(ctx context.Context, params *ec2.CreateDhcpOpti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateDhcpOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1706,6 +1874,10 @@ func (_m *EC2) CreateEgressOnlyInternetGateway(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.CreateEgressOnlyInternetGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateEgressOnlyInternetGatewayInput, ...func(*ec2.Options)) (*ec2.CreateEgressOnlyInternetGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateEgressOnlyInternetGatewayInput, ...func(*ec2.Options)) *ec2.CreateEgressOnlyInternetGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1714,7 +1886,6 @@ func (_m *EC2) CreateEgressOnlyInternetGateway(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateEgressOnlyInternetGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1736,6 +1907,10 @@ func (_m *EC2) CreateFleet(ctx context.Context, params *ec2.CreateFleetInput, op ret := _m.Called(_ca...) var r0 *ec2.CreateFleetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateFleetInput, ...func(*ec2.Options)) (*ec2.CreateFleetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateFleetInput, ...func(*ec2.Options)) *ec2.CreateFleetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1744,7 +1919,6 @@ func (_m *EC2) CreateFleet(ctx context.Context, params *ec2.CreateFleetInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateFleetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1766,6 +1940,10 @@ func (_m *EC2) CreateFlowLogs(ctx context.Context, params *ec2.CreateFlowLogsInp ret := _m.Called(_ca...) var r0 *ec2.CreateFlowLogsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateFlowLogsInput, ...func(*ec2.Options)) (*ec2.CreateFlowLogsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateFlowLogsInput, ...func(*ec2.Options)) *ec2.CreateFlowLogsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1774,7 +1952,6 @@ func (_m *EC2) CreateFlowLogs(ctx context.Context, params *ec2.CreateFlowLogsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateFlowLogsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1796,6 +1973,10 @@ func (_m *EC2) CreateFpgaImage(ctx context.Context, params *ec2.CreateFpgaImageI ret := _m.Called(_ca...) var r0 *ec2.CreateFpgaImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateFpgaImageInput, ...func(*ec2.Options)) (*ec2.CreateFpgaImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateFpgaImageInput, ...func(*ec2.Options)) *ec2.CreateFpgaImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1804,7 +1985,6 @@ func (_m *EC2) CreateFpgaImage(ctx context.Context, params *ec2.CreateFpgaImageI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateFpgaImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1826,6 +2006,10 @@ func (_m *EC2) CreateImage(ctx context.Context, params *ec2.CreateImageInput, op ret := _m.Called(_ca...) var r0 *ec2.CreateImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateImageInput, ...func(*ec2.Options)) (*ec2.CreateImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateImageInput, ...func(*ec2.Options)) *ec2.CreateImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1834,7 +2018,6 @@ func (_m *EC2) CreateImage(ctx context.Context, params *ec2.CreateImageInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1856,6 +2039,10 @@ func (_m *EC2) CreateInstanceEventWindow(ctx context.Context, params *ec2.Create ret := _m.Called(_ca...) var r0 *ec2.CreateInstanceEventWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateInstanceEventWindowInput, ...func(*ec2.Options)) (*ec2.CreateInstanceEventWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateInstanceEventWindowInput, ...func(*ec2.Options)) *ec2.CreateInstanceEventWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1864,7 +2051,6 @@ func (_m *EC2) CreateInstanceEventWindow(ctx context.Context, params *ec2.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateInstanceEventWindowInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1886,6 +2072,10 @@ func (_m *EC2) CreateInstanceExportTask(ctx context.Context, params *ec2.CreateI ret := _m.Called(_ca...) var r0 *ec2.CreateInstanceExportTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateInstanceExportTaskInput, ...func(*ec2.Options)) (*ec2.CreateInstanceExportTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateInstanceExportTaskInput, ...func(*ec2.Options)) *ec2.CreateInstanceExportTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1894,7 +2084,6 @@ func (_m *EC2) CreateInstanceExportTask(ctx context.Context, params *ec2.CreateI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateInstanceExportTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1916,6 +2105,10 @@ func (_m *EC2) CreateInternetGateway(ctx context.Context, params *ec2.CreateInte ret := _m.Called(_ca...) var r0 *ec2.CreateInternetGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateInternetGatewayInput, ...func(*ec2.Options)) (*ec2.CreateInternetGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateInternetGatewayInput, ...func(*ec2.Options)) *ec2.CreateInternetGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1924,7 +2117,6 @@ func (_m *EC2) CreateInternetGateway(ctx context.Context, params *ec2.CreateInte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateInternetGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1946,6 +2138,10 @@ func (_m *EC2) CreateIpam(ctx context.Context, params *ec2.CreateIpamInput, optF ret := _m.Called(_ca...) var r0 *ec2.CreateIpamOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateIpamInput, ...func(*ec2.Options)) (*ec2.CreateIpamOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateIpamInput, ...func(*ec2.Options)) *ec2.CreateIpamOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1954,7 +2150,6 @@ func (_m *EC2) CreateIpam(ctx context.Context, params *ec2.CreateIpamInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateIpamInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1976,6 +2171,10 @@ func (_m *EC2) CreateIpamPool(ctx context.Context, params *ec2.CreateIpamPoolInp ret := _m.Called(_ca...) var r0 *ec2.CreateIpamPoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateIpamPoolInput, ...func(*ec2.Options)) (*ec2.CreateIpamPoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateIpamPoolInput, ...func(*ec2.Options)) *ec2.CreateIpamPoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1984,7 +2183,6 @@ func (_m *EC2) CreateIpamPool(ctx context.Context, params *ec2.CreateIpamPoolInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateIpamPoolInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2006,6 +2204,10 @@ func (_m *EC2) CreateIpamScope(ctx context.Context, params *ec2.CreateIpamScopeI ret := _m.Called(_ca...) var r0 *ec2.CreateIpamScopeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateIpamScopeInput, ...func(*ec2.Options)) (*ec2.CreateIpamScopeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateIpamScopeInput, ...func(*ec2.Options)) *ec2.CreateIpamScopeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2014,7 +2216,6 @@ func (_m *EC2) CreateIpamScope(ctx context.Context, params *ec2.CreateIpamScopeI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateIpamScopeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2036,6 +2237,10 @@ func (_m *EC2) CreateKeyPair(ctx context.Context, params *ec2.CreateKeyPairInput ret := _m.Called(_ca...) var r0 *ec2.CreateKeyPairOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateKeyPairInput, ...func(*ec2.Options)) (*ec2.CreateKeyPairOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateKeyPairInput, ...func(*ec2.Options)) *ec2.CreateKeyPairOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2044,7 +2249,6 @@ func (_m *EC2) CreateKeyPair(ctx context.Context, params *ec2.CreateKeyPairInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateKeyPairInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2066,6 +2270,10 @@ func (_m *EC2) CreateLaunchTemplate(ctx context.Context, params *ec2.CreateLaunc ret := _m.Called(_ca...) var r0 *ec2.CreateLaunchTemplateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLaunchTemplateInput, ...func(*ec2.Options)) (*ec2.CreateLaunchTemplateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLaunchTemplateInput, ...func(*ec2.Options)) *ec2.CreateLaunchTemplateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2074,7 +2282,6 @@ func (_m *EC2) CreateLaunchTemplate(ctx context.Context, params *ec2.CreateLaunc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateLaunchTemplateInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2096,6 +2303,10 @@ func (_m *EC2) CreateLaunchTemplateVersion(ctx context.Context, params *ec2.Crea ret := _m.Called(_ca...) var r0 *ec2.CreateLaunchTemplateVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLaunchTemplateVersionInput, ...func(*ec2.Options)) (*ec2.CreateLaunchTemplateVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLaunchTemplateVersionInput, ...func(*ec2.Options)) *ec2.CreateLaunchTemplateVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2104,7 +2315,6 @@ func (_m *EC2) CreateLaunchTemplateVersion(ctx context.Context, params *ec2.Crea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateLaunchTemplateVersionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2126,6 +2336,10 @@ func (_m *EC2) CreateLocalGatewayRoute(ctx context.Context, params *ec2.CreateLo ret := _m.Called(_ca...) var r0 *ec2.CreateLocalGatewayRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLocalGatewayRouteInput, ...func(*ec2.Options)) (*ec2.CreateLocalGatewayRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLocalGatewayRouteInput, ...func(*ec2.Options)) *ec2.CreateLocalGatewayRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2134,7 +2348,6 @@ func (_m *EC2) CreateLocalGatewayRoute(ctx context.Context, params *ec2.CreateLo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateLocalGatewayRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2156,6 +2369,10 @@ func (_m *EC2) CreateLocalGatewayRouteTableVpcAssociation(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.CreateLocalGatewayRouteTableVpcAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLocalGatewayRouteTableVpcAssociationInput, ...func(*ec2.Options)) (*ec2.CreateLocalGatewayRouteTableVpcAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateLocalGatewayRouteTableVpcAssociationInput, ...func(*ec2.Options)) *ec2.CreateLocalGatewayRouteTableVpcAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2164,7 +2381,6 @@ func (_m *EC2) CreateLocalGatewayRouteTableVpcAssociation(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateLocalGatewayRouteTableVpcAssociationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2186,6 +2402,10 @@ func (_m *EC2) CreateManagedPrefixList(ctx context.Context, params *ec2.CreateMa ret := _m.Called(_ca...) var r0 *ec2.CreateManagedPrefixListOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateManagedPrefixListInput, ...func(*ec2.Options)) (*ec2.CreateManagedPrefixListOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateManagedPrefixListInput, ...func(*ec2.Options)) *ec2.CreateManagedPrefixListOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2194,7 +2414,6 @@ func (_m *EC2) CreateManagedPrefixList(ctx context.Context, params *ec2.CreateMa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateManagedPrefixListInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2216,6 +2435,10 @@ func (_m *EC2) CreateNatGateway(ctx context.Context, params *ec2.CreateNatGatewa ret := _m.Called(_ca...) var r0 *ec2.CreateNatGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNatGatewayInput, ...func(*ec2.Options)) (*ec2.CreateNatGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNatGatewayInput, ...func(*ec2.Options)) *ec2.CreateNatGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2224,7 +2447,6 @@ func (_m *EC2) CreateNatGateway(ctx context.Context, params *ec2.CreateNatGatewa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNatGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2246,6 +2468,10 @@ func (_m *EC2) CreateNetworkAcl(ctx context.Context, params *ec2.CreateNetworkAc ret := _m.Called(_ca...) var r0 *ec2.CreateNetworkAclOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkAclInput, ...func(*ec2.Options)) (*ec2.CreateNetworkAclOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkAclInput, ...func(*ec2.Options)) *ec2.CreateNetworkAclOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2254,7 +2480,6 @@ func (_m *EC2) CreateNetworkAcl(ctx context.Context, params *ec2.CreateNetworkAc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNetworkAclInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2276,6 +2501,10 @@ func (_m *EC2) CreateNetworkAclEntry(ctx context.Context, params *ec2.CreateNetw ret := _m.Called(_ca...) var r0 *ec2.CreateNetworkAclEntryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkAclEntryInput, ...func(*ec2.Options)) (*ec2.CreateNetworkAclEntryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkAclEntryInput, ...func(*ec2.Options)) *ec2.CreateNetworkAclEntryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2284,7 +2513,6 @@ func (_m *EC2) CreateNetworkAclEntry(ctx context.Context, params *ec2.CreateNetw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNetworkAclEntryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2306,6 +2534,10 @@ func (_m *EC2) CreateNetworkInsightsAccessScope(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.CreateNetworkInsightsAccessScopeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInsightsAccessScopeInput, ...func(*ec2.Options)) (*ec2.CreateNetworkInsightsAccessScopeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInsightsAccessScopeInput, ...func(*ec2.Options)) *ec2.CreateNetworkInsightsAccessScopeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2314,7 +2546,6 @@ func (_m *EC2) CreateNetworkInsightsAccessScope(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNetworkInsightsAccessScopeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2336,6 +2567,10 @@ func (_m *EC2) CreateNetworkInsightsPath(ctx context.Context, params *ec2.Create ret := _m.Called(_ca...) var r0 *ec2.CreateNetworkInsightsPathOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInsightsPathInput, ...func(*ec2.Options)) (*ec2.CreateNetworkInsightsPathOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInsightsPathInput, ...func(*ec2.Options)) *ec2.CreateNetworkInsightsPathOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2344,7 +2579,6 @@ func (_m *EC2) CreateNetworkInsightsPath(ctx context.Context, params *ec2.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNetworkInsightsPathInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2366,6 +2600,10 @@ func (_m *EC2) CreateNetworkInterface(ctx context.Context, params *ec2.CreateNet ret := _m.Called(_ca...) var r0 *ec2.CreateNetworkInterfaceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInterfaceInput, ...func(*ec2.Options)) (*ec2.CreateNetworkInterfaceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInterfaceInput, ...func(*ec2.Options)) *ec2.CreateNetworkInterfaceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2374,7 +2612,6 @@ func (_m *EC2) CreateNetworkInterface(ctx context.Context, params *ec2.CreateNet } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNetworkInterfaceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2396,6 +2633,10 @@ func (_m *EC2) CreateNetworkInterfacePermission(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.CreateNetworkInterfacePermissionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInterfacePermissionInput, ...func(*ec2.Options)) (*ec2.CreateNetworkInterfacePermissionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateNetworkInterfacePermissionInput, ...func(*ec2.Options)) *ec2.CreateNetworkInterfacePermissionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2404,7 +2645,6 @@ func (_m *EC2) CreateNetworkInterfacePermission(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateNetworkInterfacePermissionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2426,6 +2666,10 @@ func (_m *EC2) CreatePlacementGroup(ctx context.Context, params *ec2.CreatePlace ret := _m.Called(_ca...) var r0 *ec2.CreatePlacementGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreatePlacementGroupInput, ...func(*ec2.Options)) (*ec2.CreatePlacementGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreatePlacementGroupInput, ...func(*ec2.Options)) *ec2.CreatePlacementGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2434,7 +2678,6 @@ func (_m *EC2) CreatePlacementGroup(ctx context.Context, params *ec2.CreatePlace } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreatePlacementGroupInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2456,6 +2699,10 @@ func (_m *EC2) CreatePublicIpv4Pool(ctx context.Context, params *ec2.CreatePubli ret := _m.Called(_ca...) var r0 *ec2.CreatePublicIpv4PoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreatePublicIpv4PoolInput, ...func(*ec2.Options)) (*ec2.CreatePublicIpv4PoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreatePublicIpv4PoolInput, ...func(*ec2.Options)) *ec2.CreatePublicIpv4PoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2464,7 +2711,6 @@ func (_m *EC2) CreatePublicIpv4Pool(ctx context.Context, params *ec2.CreatePubli } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreatePublicIpv4PoolInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2486,6 +2732,10 @@ func (_m *EC2) CreateReplaceRootVolumeTask(ctx context.Context, params *ec2.Crea ret := _m.Called(_ca...) var r0 *ec2.CreateReplaceRootVolumeTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateReplaceRootVolumeTaskInput, ...func(*ec2.Options)) (*ec2.CreateReplaceRootVolumeTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateReplaceRootVolumeTaskInput, ...func(*ec2.Options)) *ec2.CreateReplaceRootVolumeTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2494,7 +2744,6 @@ func (_m *EC2) CreateReplaceRootVolumeTask(ctx context.Context, params *ec2.Crea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateReplaceRootVolumeTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2516,6 +2765,10 @@ func (_m *EC2) CreateReservedInstancesListing(ctx context.Context, params *ec2.C ret := _m.Called(_ca...) var r0 *ec2.CreateReservedInstancesListingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateReservedInstancesListingInput, ...func(*ec2.Options)) (*ec2.CreateReservedInstancesListingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateReservedInstancesListingInput, ...func(*ec2.Options)) *ec2.CreateReservedInstancesListingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2524,7 +2777,6 @@ func (_m *EC2) CreateReservedInstancesListing(ctx context.Context, params *ec2.C } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateReservedInstancesListingInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2546,6 +2798,10 @@ func (_m *EC2) CreateRestoreImageTask(ctx context.Context, params *ec2.CreateRes ret := _m.Called(_ca...) var r0 *ec2.CreateRestoreImageTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRestoreImageTaskInput, ...func(*ec2.Options)) (*ec2.CreateRestoreImageTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRestoreImageTaskInput, ...func(*ec2.Options)) *ec2.CreateRestoreImageTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2554,7 +2810,6 @@ func (_m *EC2) CreateRestoreImageTask(ctx context.Context, params *ec2.CreateRes } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateRestoreImageTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2576,7 +2831,11 @@ func (_m *EC2) CreateRoute(ctx context.Context, params *ec2.CreateRouteInput, op ret := _m.Called(_ca...) var r0 *ec2.CreateRouteOutput - if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRouteInput, ...func(*ec2.Options)) *ec2.CreateRouteOutput); ok { + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRouteInput, ...func(*ec2.Options)) (*ec2.CreateRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRouteInput, ...func(*ec2.Options)) *ec2.CreateRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { if ret.Get(0) != nil { @@ -2584,7 +2843,6 @@ func (_m *EC2) CreateRoute(ctx context.Context, params *ec2.CreateRouteInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2606,6 +2864,10 @@ func (_m *EC2) CreateRouteTable(ctx context.Context, params *ec2.CreateRouteTabl ret := _m.Called(_ca...) var r0 *ec2.CreateRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRouteTableInput, ...func(*ec2.Options)) (*ec2.CreateRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateRouteTableInput, ...func(*ec2.Options)) *ec2.CreateRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2614,7 +2876,6 @@ func (_m *EC2) CreateRouteTable(ctx context.Context, params *ec2.CreateRouteTabl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2636,6 +2897,10 @@ func (_m *EC2) CreateSecurityGroup(ctx context.Context, params *ec2.CreateSecuri ret := _m.Called(_ca...) var r0 *ec2.CreateSecurityGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSecurityGroupInput, ...func(*ec2.Options)) (*ec2.CreateSecurityGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSecurityGroupInput, ...func(*ec2.Options)) *ec2.CreateSecurityGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2644,7 +2909,6 @@ func (_m *EC2) CreateSecurityGroup(ctx context.Context, params *ec2.CreateSecuri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateSecurityGroupInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2666,6 +2930,10 @@ func (_m *EC2) CreateSnapshot(ctx context.Context, params *ec2.CreateSnapshotInp ret := _m.Called(_ca...) var r0 *ec2.CreateSnapshotOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSnapshotInput, ...func(*ec2.Options)) (*ec2.CreateSnapshotOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSnapshotInput, ...func(*ec2.Options)) *ec2.CreateSnapshotOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2674,7 +2942,6 @@ func (_m *EC2) CreateSnapshot(ctx context.Context, params *ec2.CreateSnapshotInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateSnapshotInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2696,6 +2963,10 @@ func (_m *EC2) CreateSnapshots(ctx context.Context, params *ec2.CreateSnapshotsI ret := _m.Called(_ca...) var r0 *ec2.CreateSnapshotsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSnapshotsInput, ...func(*ec2.Options)) (*ec2.CreateSnapshotsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSnapshotsInput, ...func(*ec2.Options)) *ec2.CreateSnapshotsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2704,7 +2975,6 @@ func (_m *EC2) CreateSnapshots(ctx context.Context, params *ec2.CreateSnapshotsI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateSnapshotsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2726,6 +2996,10 @@ func (_m *EC2) CreateSpotDatafeedSubscription(ctx context.Context, params *ec2.C ret := _m.Called(_ca...) var r0 *ec2.CreateSpotDatafeedSubscriptionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) (*ec2.CreateSpotDatafeedSubscriptionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) *ec2.CreateSpotDatafeedSubscriptionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2734,7 +3008,6 @@ func (_m *EC2) CreateSpotDatafeedSubscription(ctx context.Context, params *ec2.C } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2756,6 +3029,10 @@ func (_m *EC2) CreateStoreImageTask(ctx context.Context, params *ec2.CreateStore ret := _m.Called(_ca...) var r0 *ec2.CreateStoreImageTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateStoreImageTaskInput, ...func(*ec2.Options)) (*ec2.CreateStoreImageTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateStoreImageTaskInput, ...func(*ec2.Options)) *ec2.CreateStoreImageTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2764,7 +3041,6 @@ func (_m *EC2) CreateStoreImageTask(ctx context.Context, params *ec2.CreateStore } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateStoreImageTaskInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2786,6 +3062,10 @@ func (_m *EC2) CreateSubnet(ctx context.Context, params *ec2.CreateSubnetInput, ret := _m.Called(_ca...) var r0 *ec2.CreateSubnetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSubnetInput, ...func(*ec2.Options)) (*ec2.CreateSubnetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSubnetInput, ...func(*ec2.Options)) *ec2.CreateSubnetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2794,7 +3074,6 @@ func (_m *EC2) CreateSubnet(ctx context.Context, params *ec2.CreateSubnetInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateSubnetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2816,6 +3095,10 @@ func (_m *EC2) CreateSubnetCidrReservation(ctx context.Context, params *ec2.Crea ret := _m.Called(_ca...) var r0 *ec2.CreateSubnetCidrReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSubnetCidrReservationInput, ...func(*ec2.Options)) (*ec2.CreateSubnetCidrReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateSubnetCidrReservationInput, ...func(*ec2.Options)) *ec2.CreateSubnetCidrReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2824,7 +3107,6 @@ func (_m *EC2) CreateSubnetCidrReservation(ctx context.Context, params *ec2.Crea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateSubnetCidrReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2846,6 +3128,10 @@ func (_m *EC2) CreateTags(ctx context.Context, params *ec2.CreateTagsInput, optF ret := _m.Called(_ca...) var r0 *ec2.CreateTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTagsInput, ...func(*ec2.Options)) (*ec2.CreateTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTagsInput, ...func(*ec2.Options)) *ec2.CreateTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2854,7 +3140,6 @@ func (_m *EC2) CreateTags(ctx context.Context, params *ec2.CreateTagsInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTagsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2876,6 +3161,10 @@ func (_m *EC2) CreateTrafficMirrorFilter(ctx context.Context, params *ec2.Create ret := _m.Called(_ca...) var r0 *ec2.CreateTrafficMirrorFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorFilterInput, ...func(*ec2.Options)) (*ec2.CreateTrafficMirrorFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorFilterInput, ...func(*ec2.Options)) *ec2.CreateTrafficMirrorFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2884,7 +3173,6 @@ func (_m *EC2) CreateTrafficMirrorFilter(ctx context.Context, params *ec2.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTrafficMirrorFilterInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2906,6 +3194,10 @@ func (_m *EC2) CreateTrafficMirrorFilterRule(ctx context.Context, params *ec2.Cr ret := _m.Called(_ca...) var r0 *ec2.CreateTrafficMirrorFilterRuleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) (*ec2.CreateTrafficMirrorFilterRuleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) *ec2.CreateTrafficMirrorFilterRuleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2914,7 +3206,6 @@ func (_m *EC2) CreateTrafficMirrorFilterRule(ctx context.Context, params *ec2.Cr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2936,6 +3227,10 @@ func (_m *EC2) CreateTrafficMirrorSession(ctx context.Context, params *ec2.Creat ret := _m.Called(_ca...) var r0 *ec2.CreateTrafficMirrorSessionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorSessionInput, ...func(*ec2.Options)) (*ec2.CreateTrafficMirrorSessionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorSessionInput, ...func(*ec2.Options)) *ec2.CreateTrafficMirrorSessionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2944,7 +3239,6 @@ func (_m *EC2) CreateTrafficMirrorSession(ctx context.Context, params *ec2.Creat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTrafficMirrorSessionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2966,6 +3260,10 @@ func (_m *EC2) CreateTrafficMirrorTarget(ctx context.Context, params *ec2.Create ret := _m.Called(_ca...) var r0 *ec2.CreateTrafficMirrorTargetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorTargetInput, ...func(*ec2.Options)) (*ec2.CreateTrafficMirrorTargetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTrafficMirrorTargetInput, ...func(*ec2.Options)) *ec2.CreateTrafficMirrorTargetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2974,7 +3272,6 @@ func (_m *EC2) CreateTrafficMirrorTarget(ctx context.Context, params *ec2.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTrafficMirrorTargetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2996,6 +3293,10 @@ func (_m *EC2) CreateTransitGateway(ctx context.Context, params *ec2.CreateTrans ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3004,7 +3305,6 @@ func (_m *EC2) CreateTransitGateway(ctx context.Context, params *ec2.CreateTrans } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3026,6 +3326,10 @@ func (_m *EC2) CreateTransitGatewayConnect(ctx context.Context, params *ec2.Crea ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayConnectOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayConnectInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayConnectOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayConnectInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayConnectOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3034,7 +3338,6 @@ func (_m *EC2) CreateTransitGatewayConnect(ctx context.Context, params *ec2.Crea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayConnectInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3056,6 +3359,10 @@ func (_m *EC2) CreateTransitGatewayConnectPeer(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayConnectPeerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayConnectPeerInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayConnectPeerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayConnectPeerInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayConnectPeerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3064,7 +3371,6 @@ func (_m *EC2) CreateTransitGatewayConnectPeer(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayConnectPeerInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3086,6 +3392,10 @@ func (_m *EC2) CreateTransitGatewayMulticastDomain(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayMulticastDomainOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayMulticastDomainOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayMulticastDomainOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3094,7 +3404,6 @@ func (_m *EC2) CreateTransitGatewayMulticastDomain(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3116,6 +3425,10 @@ func (_m *EC2) CreateTransitGatewayPeeringAttachment(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayPeeringAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayPeeringAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayPeeringAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3124,7 +3437,6 @@ func (_m *EC2) CreateTransitGatewayPeeringAttachment(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3146,6 +3458,10 @@ func (_m *EC2) CreateTransitGatewayPrefixListReference(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayPrefixListReferenceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayPrefixListReferenceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayPrefixListReferenceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3154,7 +3470,6 @@ func (_m *EC2) CreateTransitGatewayPrefixListReference(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3176,6 +3491,10 @@ func (_m *EC2) CreateTransitGatewayRoute(ctx context.Context, params *ec2.Create ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayRouteInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayRouteInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3184,7 +3503,6 @@ func (_m *EC2) CreateTransitGatewayRoute(ctx context.Context, params *ec2.Create } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3206,6 +3524,10 @@ func (_m *EC2) CreateTransitGatewayRouteTable(ctx context.Context, params *ec2.C ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayRouteTableInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayRouteTableInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3214,7 +3536,6 @@ func (_m *EC2) CreateTransitGatewayRouteTable(ctx context.Context, params *ec2.C } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3236,6 +3557,10 @@ func (_m *EC2) CreateTransitGatewayVpcAttachment(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.CreateTransitGatewayVpcAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) (*ec2.CreateTransitGatewayVpcAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) *ec2.CreateTransitGatewayVpcAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3244,7 +3569,6 @@ func (_m *EC2) CreateTransitGatewayVpcAttachment(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3266,6 +3590,10 @@ func (_m *EC2) CreateVolume(ctx context.Context, params *ec2.CreateVolumeInput, ret := _m.Called(_ca...) var r0 *ec2.CreateVolumeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVolumeInput, ...func(*ec2.Options)) (*ec2.CreateVolumeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVolumeInput, ...func(*ec2.Options)) *ec2.CreateVolumeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3274,7 +3602,6 @@ func (_m *EC2) CreateVolume(ctx context.Context, params *ec2.CreateVolumeInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVolumeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3296,6 +3623,10 @@ func (_m *EC2) CreateVpc(ctx context.Context, params *ec2.CreateVpcInput, optFns ret := _m.Called(_ca...) var r0 *ec2.CreateVpcOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcInput, ...func(*ec2.Options)) (*ec2.CreateVpcOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcInput, ...func(*ec2.Options)) *ec2.CreateVpcOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3304,7 +3635,6 @@ func (_m *EC2) CreateVpc(ctx context.Context, params *ec2.CreateVpcInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpcInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3326,6 +3656,10 @@ func (_m *EC2) CreateVpcEndpoint(ctx context.Context, params *ec2.CreateVpcEndpo ret := _m.Called(_ca...) var r0 *ec2.CreateVpcEndpointOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcEndpointInput, ...func(*ec2.Options)) (*ec2.CreateVpcEndpointOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcEndpointInput, ...func(*ec2.Options)) *ec2.CreateVpcEndpointOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3334,7 +3668,6 @@ func (_m *EC2) CreateVpcEndpoint(ctx context.Context, params *ec2.CreateVpcEndpo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpcEndpointInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3356,6 +3689,10 @@ func (_m *EC2) CreateVpcEndpointConnectionNotification(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.CreateVpcEndpointConnectionNotificationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcEndpointConnectionNotificationInput, ...func(*ec2.Options)) (*ec2.CreateVpcEndpointConnectionNotificationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcEndpointConnectionNotificationInput, ...func(*ec2.Options)) *ec2.CreateVpcEndpointConnectionNotificationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3364,7 +3701,6 @@ func (_m *EC2) CreateVpcEndpointConnectionNotification(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpcEndpointConnectionNotificationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3386,6 +3722,10 @@ func (_m *EC2) CreateVpcEndpointServiceConfiguration(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.CreateVpcEndpointServiceConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcEndpointServiceConfigurationInput, ...func(*ec2.Options)) (*ec2.CreateVpcEndpointServiceConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcEndpointServiceConfigurationInput, ...func(*ec2.Options)) *ec2.CreateVpcEndpointServiceConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3394,7 +3734,6 @@ func (_m *EC2) CreateVpcEndpointServiceConfiguration(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpcEndpointServiceConfigurationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3416,6 +3755,10 @@ func (_m *EC2) CreateVpcPeeringConnection(ctx context.Context, params *ec2.Creat ret := _m.Called(_ca...) var r0 *ec2.CreateVpcPeeringConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcPeeringConnectionInput, ...func(*ec2.Options)) (*ec2.CreateVpcPeeringConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpcPeeringConnectionInput, ...func(*ec2.Options)) *ec2.CreateVpcPeeringConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3424,7 +3767,6 @@ func (_m *EC2) CreateVpcPeeringConnection(ctx context.Context, params *ec2.Creat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpcPeeringConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3446,6 +3788,10 @@ func (_m *EC2) CreateVpnConnection(ctx context.Context, params *ec2.CreateVpnCon ret := _m.Called(_ca...) var r0 *ec2.CreateVpnConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpnConnectionInput, ...func(*ec2.Options)) (*ec2.CreateVpnConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpnConnectionInput, ...func(*ec2.Options)) *ec2.CreateVpnConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3454,7 +3800,6 @@ func (_m *EC2) CreateVpnConnection(ctx context.Context, params *ec2.CreateVpnCon } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpnConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3476,6 +3821,10 @@ func (_m *EC2) CreateVpnConnectionRoute(ctx context.Context, params *ec2.CreateV ret := _m.Called(_ca...) var r0 *ec2.CreateVpnConnectionRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpnConnectionRouteInput, ...func(*ec2.Options)) (*ec2.CreateVpnConnectionRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpnConnectionRouteInput, ...func(*ec2.Options)) *ec2.CreateVpnConnectionRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3484,7 +3833,6 @@ func (_m *EC2) CreateVpnConnectionRoute(ctx context.Context, params *ec2.CreateV } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpnConnectionRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3506,6 +3854,10 @@ func (_m *EC2) CreateVpnGateway(ctx context.Context, params *ec2.CreateVpnGatewa ret := _m.Called(_ca...) var r0 *ec2.CreateVpnGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpnGatewayInput, ...func(*ec2.Options)) (*ec2.CreateVpnGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.CreateVpnGatewayInput, ...func(*ec2.Options)) *ec2.CreateVpnGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3514,7 +3866,6 @@ func (_m *EC2) CreateVpnGateway(ctx context.Context, params *ec2.CreateVpnGatewa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.CreateVpnGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3536,6 +3887,10 @@ func (_m *EC2) DeleteCarrierGateway(ctx context.Context, params *ec2.DeleteCarri ret := _m.Called(_ca...) var r0 *ec2.DeleteCarrierGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteCarrierGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteCarrierGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteCarrierGatewayInput, ...func(*ec2.Options)) *ec2.DeleteCarrierGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3544,7 +3899,6 @@ func (_m *EC2) DeleteCarrierGateway(ctx context.Context, params *ec2.DeleteCarri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteCarrierGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3566,6 +3920,10 @@ func (_m *EC2) DeleteClientVpnEndpoint(ctx context.Context, params *ec2.DeleteCl ret := _m.Called(_ca...) var r0 *ec2.DeleteClientVpnEndpointOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteClientVpnEndpointInput, ...func(*ec2.Options)) (*ec2.DeleteClientVpnEndpointOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteClientVpnEndpointInput, ...func(*ec2.Options)) *ec2.DeleteClientVpnEndpointOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3574,7 +3932,6 @@ func (_m *EC2) DeleteClientVpnEndpoint(ctx context.Context, params *ec2.DeleteCl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteClientVpnEndpointInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3596,6 +3953,10 @@ func (_m *EC2) DeleteClientVpnRoute(ctx context.Context, params *ec2.DeleteClien ret := _m.Called(_ca...) var r0 *ec2.DeleteClientVpnRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteClientVpnRouteInput, ...func(*ec2.Options)) (*ec2.DeleteClientVpnRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteClientVpnRouteInput, ...func(*ec2.Options)) *ec2.DeleteClientVpnRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3604,7 +3965,6 @@ func (_m *EC2) DeleteClientVpnRoute(ctx context.Context, params *ec2.DeleteClien } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteClientVpnRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3626,6 +3986,10 @@ func (_m *EC2) DeleteCustomerGateway(ctx context.Context, params *ec2.DeleteCust ret := _m.Called(_ca...) var r0 *ec2.DeleteCustomerGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteCustomerGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteCustomerGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteCustomerGatewayInput, ...func(*ec2.Options)) *ec2.DeleteCustomerGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3634,7 +3998,6 @@ func (_m *EC2) DeleteCustomerGateway(ctx context.Context, params *ec2.DeleteCust } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteCustomerGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3656,6 +4019,10 @@ func (_m *EC2) DeleteDhcpOptions(ctx context.Context, params *ec2.DeleteDhcpOpti ret := _m.Called(_ca...) var r0 *ec2.DeleteDhcpOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteDhcpOptionsInput, ...func(*ec2.Options)) (*ec2.DeleteDhcpOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteDhcpOptionsInput, ...func(*ec2.Options)) *ec2.DeleteDhcpOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3664,7 +4031,6 @@ func (_m *EC2) DeleteDhcpOptions(ctx context.Context, params *ec2.DeleteDhcpOpti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteDhcpOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3686,6 +4052,10 @@ func (_m *EC2) DeleteEgressOnlyInternetGateway(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DeleteEgressOnlyInternetGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteEgressOnlyInternetGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteEgressOnlyInternetGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteEgressOnlyInternetGatewayInput, ...func(*ec2.Options)) *ec2.DeleteEgressOnlyInternetGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3694,7 +4064,6 @@ func (_m *EC2) DeleteEgressOnlyInternetGateway(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteEgressOnlyInternetGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3716,6 +4085,10 @@ func (_m *EC2) DeleteFleets(ctx context.Context, params *ec2.DeleteFleetsInput, ret := _m.Called(_ca...) var r0 *ec2.DeleteFleetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteFleetsInput, ...func(*ec2.Options)) (*ec2.DeleteFleetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteFleetsInput, ...func(*ec2.Options)) *ec2.DeleteFleetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3724,7 +4097,6 @@ func (_m *EC2) DeleteFleets(ctx context.Context, params *ec2.DeleteFleetsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteFleetsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3746,6 +4118,10 @@ func (_m *EC2) DeleteFlowLogs(ctx context.Context, params *ec2.DeleteFlowLogsInp ret := _m.Called(_ca...) var r0 *ec2.DeleteFlowLogsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteFlowLogsInput, ...func(*ec2.Options)) (*ec2.DeleteFlowLogsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteFlowLogsInput, ...func(*ec2.Options)) *ec2.DeleteFlowLogsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3754,7 +4130,6 @@ func (_m *EC2) DeleteFlowLogs(ctx context.Context, params *ec2.DeleteFlowLogsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteFlowLogsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3776,6 +4151,10 @@ func (_m *EC2) DeleteFpgaImage(ctx context.Context, params *ec2.DeleteFpgaImageI ret := _m.Called(_ca...) var r0 *ec2.DeleteFpgaImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteFpgaImageInput, ...func(*ec2.Options)) (*ec2.DeleteFpgaImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteFpgaImageInput, ...func(*ec2.Options)) *ec2.DeleteFpgaImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3784,7 +4163,6 @@ func (_m *EC2) DeleteFpgaImage(ctx context.Context, params *ec2.DeleteFpgaImageI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteFpgaImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3806,6 +4184,10 @@ func (_m *EC2) DeleteInstanceEventWindow(ctx context.Context, params *ec2.Delete ret := _m.Called(_ca...) var r0 *ec2.DeleteInstanceEventWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteInstanceEventWindowInput, ...func(*ec2.Options)) (*ec2.DeleteInstanceEventWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteInstanceEventWindowInput, ...func(*ec2.Options)) *ec2.DeleteInstanceEventWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3814,7 +4196,6 @@ func (_m *EC2) DeleteInstanceEventWindow(ctx context.Context, params *ec2.Delete } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteInstanceEventWindowInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3836,6 +4217,10 @@ func (_m *EC2) DeleteInternetGateway(ctx context.Context, params *ec2.DeleteInte ret := _m.Called(_ca...) var r0 *ec2.DeleteInternetGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteInternetGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteInternetGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteInternetGatewayInput, ...func(*ec2.Options)) *ec2.DeleteInternetGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3844,7 +4229,6 @@ func (_m *EC2) DeleteInternetGateway(ctx context.Context, params *ec2.DeleteInte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteInternetGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3866,6 +4250,10 @@ func (_m *EC2) DeleteIpam(ctx context.Context, params *ec2.DeleteIpamInput, optF ret := _m.Called(_ca...) var r0 *ec2.DeleteIpamOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteIpamInput, ...func(*ec2.Options)) (*ec2.DeleteIpamOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteIpamInput, ...func(*ec2.Options)) *ec2.DeleteIpamOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3874,7 +4262,6 @@ func (_m *EC2) DeleteIpam(ctx context.Context, params *ec2.DeleteIpamInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteIpamInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3896,6 +4283,10 @@ func (_m *EC2) DeleteIpamPool(ctx context.Context, params *ec2.DeleteIpamPoolInp ret := _m.Called(_ca...) var r0 *ec2.DeleteIpamPoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteIpamPoolInput, ...func(*ec2.Options)) (*ec2.DeleteIpamPoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteIpamPoolInput, ...func(*ec2.Options)) *ec2.DeleteIpamPoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3904,7 +4295,6 @@ func (_m *EC2) DeleteIpamPool(ctx context.Context, params *ec2.DeleteIpamPoolInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteIpamPoolInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3926,6 +4316,10 @@ func (_m *EC2) DeleteIpamScope(ctx context.Context, params *ec2.DeleteIpamScopeI ret := _m.Called(_ca...) var r0 *ec2.DeleteIpamScopeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteIpamScopeInput, ...func(*ec2.Options)) (*ec2.DeleteIpamScopeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteIpamScopeInput, ...func(*ec2.Options)) *ec2.DeleteIpamScopeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3934,7 +4328,6 @@ func (_m *EC2) DeleteIpamScope(ctx context.Context, params *ec2.DeleteIpamScopeI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteIpamScopeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3956,6 +4349,10 @@ func (_m *EC2) DeleteKeyPair(ctx context.Context, params *ec2.DeleteKeyPairInput ret := _m.Called(_ca...) var r0 *ec2.DeleteKeyPairOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteKeyPairInput, ...func(*ec2.Options)) (*ec2.DeleteKeyPairOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteKeyPairInput, ...func(*ec2.Options)) *ec2.DeleteKeyPairOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3964,7 +4361,6 @@ func (_m *EC2) DeleteKeyPair(ctx context.Context, params *ec2.DeleteKeyPairInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteKeyPairInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3986,6 +4382,10 @@ func (_m *EC2) DeleteLaunchTemplate(ctx context.Context, params *ec2.DeleteLaunc ret := _m.Called(_ca...) var r0 *ec2.DeleteLaunchTemplateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLaunchTemplateInput, ...func(*ec2.Options)) (*ec2.DeleteLaunchTemplateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLaunchTemplateInput, ...func(*ec2.Options)) *ec2.DeleteLaunchTemplateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3994,7 +4394,6 @@ func (_m *EC2) DeleteLaunchTemplate(ctx context.Context, params *ec2.DeleteLaunc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteLaunchTemplateInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4016,6 +4415,10 @@ func (_m *EC2) DeleteLaunchTemplateVersions(ctx context.Context, params *ec2.Del ret := _m.Called(_ca...) var r0 *ec2.DeleteLaunchTemplateVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLaunchTemplateVersionsInput, ...func(*ec2.Options)) (*ec2.DeleteLaunchTemplateVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLaunchTemplateVersionsInput, ...func(*ec2.Options)) *ec2.DeleteLaunchTemplateVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4024,7 +4427,6 @@ func (_m *EC2) DeleteLaunchTemplateVersions(ctx context.Context, params *ec2.Del } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteLaunchTemplateVersionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4046,6 +4448,10 @@ func (_m *EC2) DeleteLocalGatewayRoute(ctx context.Context, params *ec2.DeleteLo ret := _m.Called(_ca...) var r0 *ec2.DeleteLocalGatewayRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLocalGatewayRouteInput, ...func(*ec2.Options)) (*ec2.DeleteLocalGatewayRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLocalGatewayRouteInput, ...func(*ec2.Options)) *ec2.DeleteLocalGatewayRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4054,7 +4460,6 @@ func (_m *EC2) DeleteLocalGatewayRoute(ctx context.Context, params *ec2.DeleteLo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteLocalGatewayRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4076,6 +4481,10 @@ func (_m *EC2) DeleteLocalGatewayRouteTableVpcAssociation(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.DeleteLocalGatewayRouteTableVpcAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLocalGatewayRouteTableVpcAssociationInput, ...func(*ec2.Options)) (*ec2.DeleteLocalGatewayRouteTableVpcAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteLocalGatewayRouteTableVpcAssociationInput, ...func(*ec2.Options)) *ec2.DeleteLocalGatewayRouteTableVpcAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4084,7 +4493,6 @@ func (_m *EC2) DeleteLocalGatewayRouteTableVpcAssociation(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteLocalGatewayRouteTableVpcAssociationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4106,6 +4514,10 @@ func (_m *EC2) DeleteManagedPrefixList(ctx context.Context, params *ec2.DeleteMa ret := _m.Called(_ca...) var r0 *ec2.DeleteManagedPrefixListOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteManagedPrefixListInput, ...func(*ec2.Options)) (*ec2.DeleteManagedPrefixListOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteManagedPrefixListInput, ...func(*ec2.Options)) *ec2.DeleteManagedPrefixListOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4114,7 +4526,6 @@ func (_m *EC2) DeleteManagedPrefixList(ctx context.Context, params *ec2.DeleteMa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteManagedPrefixListInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4136,6 +4547,10 @@ func (_m *EC2) DeleteNatGateway(ctx context.Context, params *ec2.DeleteNatGatewa ret := _m.Called(_ca...) var r0 *ec2.DeleteNatGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNatGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteNatGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNatGatewayInput, ...func(*ec2.Options)) *ec2.DeleteNatGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4144,7 +4559,6 @@ func (_m *EC2) DeleteNatGateway(ctx context.Context, params *ec2.DeleteNatGatewa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNatGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4166,6 +4580,10 @@ func (_m *EC2) DeleteNetworkAcl(ctx context.Context, params *ec2.DeleteNetworkAc ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkAclOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkAclInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkAclOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkAclInput, ...func(*ec2.Options)) *ec2.DeleteNetworkAclOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4174,7 +4592,6 @@ func (_m *EC2) DeleteNetworkAcl(ctx context.Context, params *ec2.DeleteNetworkAc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkAclInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4196,6 +4613,10 @@ func (_m *EC2) DeleteNetworkAclEntry(ctx context.Context, params *ec2.DeleteNetw ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkAclEntryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkAclEntryInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkAclEntryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkAclEntryInput, ...func(*ec2.Options)) *ec2.DeleteNetworkAclEntryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4204,7 +4625,6 @@ func (_m *EC2) DeleteNetworkAclEntry(ctx context.Context, params *ec2.DeleteNetw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkAclEntryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4226,6 +4646,10 @@ func (_m *EC2) DeleteNetworkInsightsAccessScope(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkInsightsAccessScopeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsAccessScopeInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkInsightsAccessScopeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsAccessScopeInput, ...func(*ec2.Options)) *ec2.DeleteNetworkInsightsAccessScopeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4234,7 +4658,6 @@ func (_m *EC2) DeleteNetworkInsightsAccessScope(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkInsightsAccessScopeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4256,6 +4679,10 @@ func (_m *EC2) DeleteNetworkInsightsAccessScopeAnalysis(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkInsightsAccessScopeAnalysisOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsAccessScopeAnalysisInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkInsightsAccessScopeAnalysisOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsAccessScopeAnalysisInput, ...func(*ec2.Options)) *ec2.DeleteNetworkInsightsAccessScopeAnalysisOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4264,7 +4691,6 @@ func (_m *EC2) DeleteNetworkInsightsAccessScopeAnalysis(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkInsightsAccessScopeAnalysisInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4286,6 +4712,10 @@ func (_m *EC2) DeleteNetworkInsightsAnalysis(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkInsightsAnalysisOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsAnalysisInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkInsightsAnalysisOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsAnalysisInput, ...func(*ec2.Options)) *ec2.DeleteNetworkInsightsAnalysisOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4294,7 +4724,6 @@ func (_m *EC2) DeleteNetworkInsightsAnalysis(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkInsightsAnalysisInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4316,6 +4745,10 @@ func (_m *EC2) DeleteNetworkInsightsPath(ctx context.Context, params *ec2.Delete ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkInsightsPathOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsPathInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkInsightsPathOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInsightsPathInput, ...func(*ec2.Options)) *ec2.DeleteNetworkInsightsPathOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4324,7 +4757,6 @@ func (_m *EC2) DeleteNetworkInsightsPath(ctx context.Context, params *ec2.Delete } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkInsightsPathInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4346,6 +4778,10 @@ func (_m *EC2) DeleteNetworkInterface(ctx context.Context, params *ec2.DeleteNet ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkInterfaceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInterfaceInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkInterfaceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInterfaceInput, ...func(*ec2.Options)) *ec2.DeleteNetworkInterfaceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4354,7 +4790,6 @@ func (_m *EC2) DeleteNetworkInterface(ctx context.Context, params *ec2.DeleteNet } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkInterfaceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4376,6 +4811,10 @@ func (_m *EC2) DeleteNetworkInterfacePermission(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.DeleteNetworkInterfacePermissionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInterfacePermissionInput, ...func(*ec2.Options)) (*ec2.DeleteNetworkInterfacePermissionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteNetworkInterfacePermissionInput, ...func(*ec2.Options)) *ec2.DeleteNetworkInterfacePermissionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4384,7 +4823,6 @@ func (_m *EC2) DeleteNetworkInterfacePermission(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteNetworkInterfacePermissionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4406,6 +4844,10 @@ func (_m *EC2) DeletePlacementGroup(ctx context.Context, params *ec2.DeletePlace ret := _m.Called(_ca...) var r0 *ec2.DeletePlacementGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeletePlacementGroupInput, ...func(*ec2.Options)) (*ec2.DeletePlacementGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeletePlacementGroupInput, ...func(*ec2.Options)) *ec2.DeletePlacementGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4414,7 +4856,6 @@ func (_m *EC2) DeletePlacementGroup(ctx context.Context, params *ec2.DeletePlace } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeletePlacementGroupInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4436,6 +4877,10 @@ func (_m *EC2) DeletePublicIpv4Pool(ctx context.Context, params *ec2.DeletePubli ret := _m.Called(_ca...) var r0 *ec2.DeletePublicIpv4PoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeletePublicIpv4PoolInput, ...func(*ec2.Options)) (*ec2.DeletePublicIpv4PoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeletePublicIpv4PoolInput, ...func(*ec2.Options)) *ec2.DeletePublicIpv4PoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4444,7 +4889,6 @@ func (_m *EC2) DeletePublicIpv4Pool(ctx context.Context, params *ec2.DeletePubli } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeletePublicIpv4PoolInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4466,6 +4910,10 @@ func (_m *EC2) DeleteQueuedReservedInstances(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DeleteQueuedReservedInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteQueuedReservedInstancesInput, ...func(*ec2.Options)) (*ec2.DeleteQueuedReservedInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteQueuedReservedInstancesInput, ...func(*ec2.Options)) *ec2.DeleteQueuedReservedInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4474,7 +4922,6 @@ func (_m *EC2) DeleteQueuedReservedInstances(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteQueuedReservedInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4496,6 +4943,10 @@ func (_m *EC2) DeleteRoute(ctx context.Context, params *ec2.DeleteRouteInput, op ret := _m.Called(_ca...) var r0 *ec2.DeleteRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteRouteInput, ...func(*ec2.Options)) (*ec2.DeleteRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteRouteInput, ...func(*ec2.Options)) *ec2.DeleteRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4504,7 +4955,6 @@ func (_m *EC2) DeleteRoute(ctx context.Context, params *ec2.DeleteRouteInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4526,6 +4976,10 @@ func (_m *EC2) DeleteRouteTable(ctx context.Context, params *ec2.DeleteRouteTabl ret := _m.Called(_ca...) var r0 *ec2.DeleteRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteRouteTableInput, ...func(*ec2.Options)) (*ec2.DeleteRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteRouteTableInput, ...func(*ec2.Options)) *ec2.DeleteRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4534,7 +4988,6 @@ func (_m *EC2) DeleteRouteTable(ctx context.Context, params *ec2.DeleteRouteTabl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4556,6 +5009,10 @@ func (_m *EC2) DeleteSecurityGroup(ctx context.Context, params *ec2.DeleteSecuri ret := _m.Called(_ca...) var r0 *ec2.DeleteSecurityGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSecurityGroupInput, ...func(*ec2.Options)) (*ec2.DeleteSecurityGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSecurityGroupInput, ...func(*ec2.Options)) *ec2.DeleteSecurityGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4564,7 +5021,6 @@ func (_m *EC2) DeleteSecurityGroup(ctx context.Context, params *ec2.DeleteSecuri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteSecurityGroupInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4586,6 +5042,10 @@ func (_m *EC2) DeleteSnapshot(ctx context.Context, params *ec2.DeleteSnapshotInp ret := _m.Called(_ca...) var r0 *ec2.DeleteSnapshotOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSnapshotInput, ...func(*ec2.Options)) (*ec2.DeleteSnapshotOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSnapshotInput, ...func(*ec2.Options)) *ec2.DeleteSnapshotOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4594,7 +5054,6 @@ func (_m *EC2) DeleteSnapshot(ctx context.Context, params *ec2.DeleteSnapshotInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteSnapshotInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4616,6 +5075,10 @@ func (_m *EC2) DeleteSpotDatafeedSubscription(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DeleteSpotDatafeedSubscriptionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) (*ec2.DeleteSpotDatafeedSubscriptionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) *ec2.DeleteSpotDatafeedSubscriptionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4624,7 +5087,6 @@ func (_m *EC2) DeleteSpotDatafeedSubscription(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4646,6 +5108,10 @@ func (_m *EC2) DeleteSubnet(ctx context.Context, params *ec2.DeleteSubnetInput, ret := _m.Called(_ca...) var r0 *ec2.DeleteSubnetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSubnetInput, ...func(*ec2.Options)) (*ec2.DeleteSubnetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSubnetInput, ...func(*ec2.Options)) *ec2.DeleteSubnetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4654,7 +5120,6 @@ func (_m *EC2) DeleteSubnet(ctx context.Context, params *ec2.DeleteSubnetInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteSubnetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4676,6 +5141,10 @@ func (_m *EC2) DeleteSubnetCidrReservation(ctx context.Context, params *ec2.Dele ret := _m.Called(_ca...) var r0 *ec2.DeleteSubnetCidrReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSubnetCidrReservationInput, ...func(*ec2.Options)) (*ec2.DeleteSubnetCidrReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteSubnetCidrReservationInput, ...func(*ec2.Options)) *ec2.DeleteSubnetCidrReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4684,7 +5153,6 @@ func (_m *EC2) DeleteSubnetCidrReservation(ctx context.Context, params *ec2.Dele } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteSubnetCidrReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4706,6 +5174,10 @@ func (_m *EC2) DeleteTags(ctx context.Context, params *ec2.DeleteTagsInput, optF ret := _m.Called(_ca...) var r0 *ec2.DeleteTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTagsInput, ...func(*ec2.Options)) (*ec2.DeleteTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTagsInput, ...func(*ec2.Options)) *ec2.DeleteTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4714,7 +5186,6 @@ func (_m *EC2) DeleteTags(ctx context.Context, params *ec2.DeleteTagsInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTagsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4736,6 +5207,10 @@ func (_m *EC2) DeleteTrafficMirrorFilter(ctx context.Context, params *ec2.Delete ret := _m.Called(_ca...) var r0 *ec2.DeleteTrafficMirrorFilterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorFilterInput, ...func(*ec2.Options)) (*ec2.DeleteTrafficMirrorFilterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorFilterInput, ...func(*ec2.Options)) *ec2.DeleteTrafficMirrorFilterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4744,7 +5219,6 @@ func (_m *EC2) DeleteTrafficMirrorFilter(ctx context.Context, params *ec2.Delete } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTrafficMirrorFilterInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4766,6 +5240,10 @@ func (_m *EC2) DeleteTrafficMirrorFilterRule(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DeleteTrafficMirrorFilterRuleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) (*ec2.DeleteTrafficMirrorFilterRuleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) *ec2.DeleteTrafficMirrorFilterRuleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4774,7 +5252,6 @@ func (_m *EC2) DeleteTrafficMirrorFilterRule(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4796,6 +5273,10 @@ func (_m *EC2) DeleteTrafficMirrorSession(ctx context.Context, params *ec2.Delet ret := _m.Called(_ca...) var r0 *ec2.DeleteTrafficMirrorSessionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorSessionInput, ...func(*ec2.Options)) (*ec2.DeleteTrafficMirrorSessionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorSessionInput, ...func(*ec2.Options)) *ec2.DeleteTrafficMirrorSessionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4804,7 +5285,6 @@ func (_m *EC2) DeleteTrafficMirrorSession(ctx context.Context, params *ec2.Delet } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTrafficMirrorSessionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4826,6 +5306,10 @@ func (_m *EC2) DeleteTrafficMirrorTarget(ctx context.Context, params *ec2.Delete ret := _m.Called(_ca...) var r0 *ec2.DeleteTrafficMirrorTargetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorTargetInput, ...func(*ec2.Options)) (*ec2.DeleteTrafficMirrorTargetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTrafficMirrorTargetInput, ...func(*ec2.Options)) *ec2.DeleteTrafficMirrorTargetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4834,7 +5318,6 @@ func (_m *EC2) DeleteTrafficMirrorTarget(ctx context.Context, params *ec2.Delete } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTrafficMirrorTargetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4856,6 +5339,10 @@ func (_m *EC2) DeleteTransitGateway(ctx context.Context, params *ec2.DeleteTrans ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4864,7 +5351,6 @@ func (_m *EC2) DeleteTransitGateway(ctx context.Context, params *ec2.DeleteTrans } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4886,6 +5372,10 @@ func (_m *EC2) DeleteTransitGatewayConnect(ctx context.Context, params *ec2.Dele ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayConnectOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayConnectInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayConnectOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayConnectInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayConnectOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4894,7 +5384,6 @@ func (_m *EC2) DeleteTransitGatewayConnect(ctx context.Context, params *ec2.Dele } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayConnectInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4916,6 +5405,10 @@ func (_m *EC2) DeleteTransitGatewayConnectPeer(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayConnectPeerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayConnectPeerInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayConnectPeerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayConnectPeerInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayConnectPeerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4924,7 +5417,6 @@ func (_m *EC2) DeleteTransitGatewayConnectPeer(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayConnectPeerInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4946,6 +5438,10 @@ func (_m *EC2) DeleteTransitGatewayMulticastDomain(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayMulticastDomainOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayMulticastDomainOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayMulticastDomainOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4954,7 +5450,6 @@ func (_m *EC2) DeleteTransitGatewayMulticastDomain(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4976,6 +5471,10 @@ func (_m *EC2) DeleteTransitGatewayPeeringAttachment(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayPeeringAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayPeeringAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayPeeringAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4984,7 +5483,6 @@ func (_m *EC2) DeleteTransitGatewayPeeringAttachment(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5006,6 +5504,10 @@ func (_m *EC2) DeleteTransitGatewayPrefixListReference(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayPrefixListReferenceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayPrefixListReferenceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayPrefixListReferenceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5014,7 +5516,6 @@ func (_m *EC2) DeleteTransitGatewayPrefixListReference(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5036,6 +5537,10 @@ func (_m *EC2) DeleteTransitGatewayRoute(ctx context.Context, params *ec2.Delete ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayRouteInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayRouteInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5044,7 +5549,6 @@ func (_m *EC2) DeleteTransitGatewayRoute(ctx context.Context, params *ec2.Delete } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5066,6 +5570,10 @@ func (_m *EC2) DeleteTransitGatewayRouteTable(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayRouteTableInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayRouteTableInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5074,7 +5582,6 @@ func (_m *EC2) DeleteTransitGatewayRouteTable(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5096,6 +5603,10 @@ func (_m *EC2) DeleteTransitGatewayVpcAttachment(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.DeleteTransitGatewayVpcAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayVpcAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) *ec2.DeleteTransitGatewayVpcAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5104,7 +5615,6 @@ func (_m *EC2) DeleteTransitGatewayVpcAttachment(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5126,6 +5636,10 @@ func (_m *EC2) DeleteVolume(ctx context.Context, params *ec2.DeleteVolumeInput, ret := _m.Called(_ca...) var r0 *ec2.DeleteVolumeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVolumeInput, ...func(*ec2.Options)) (*ec2.DeleteVolumeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVolumeInput, ...func(*ec2.Options)) *ec2.DeleteVolumeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5134,7 +5648,6 @@ func (_m *EC2) DeleteVolume(ctx context.Context, params *ec2.DeleteVolumeInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVolumeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5156,6 +5669,10 @@ func (_m *EC2) DeleteVpc(ctx context.Context, params *ec2.DeleteVpcInput, optFns ret := _m.Called(_ca...) var r0 *ec2.DeleteVpcOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcInput, ...func(*ec2.Options)) (*ec2.DeleteVpcOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcInput, ...func(*ec2.Options)) *ec2.DeleteVpcOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5164,7 +5681,6 @@ func (_m *EC2) DeleteVpc(ctx context.Context, params *ec2.DeleteVpcInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpcInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5186,6 +5702,10 @@ func (_m *EC2) DeleteVpcEndpointConnectionNotifications(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ec2.DeleteVpcEndpointConnectionNotificationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcEndpointConnectionNotificationsInput, ...func(*ec2.Options)) (*ec2.DeleteVpcEndpointConnectionNotificationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcEndpointConnectionNotificationsInput, ...func(*ec2.Options)) *ec2.DeleteVpcEndpointConnectionNotificationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5194,7 +5714,6 @@ func (_m *EC2) DeleteVpcEndpointConnectionNotifications(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpcEndpointConnectionNotificationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5216,6 +5735,10 @@ func (_m *EC2) DeleteVpcEndpointServiceConfigurations(ctx context.Context, param ret := _m.Called(_ca...) var r0 *ec2.DeleteVpcEndpointServiceConfigurationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcEndpointServiceConfigurationsInput, ...func(*ec2.Options)) (*ec2.DeleteVpcEndpointServiceConfigurationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcEndpointServiceConfigurationsInput, ...func(*ec2.Options)) *ec2.DeleteVpcEndpointServiceConfigurationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5224,7 +5747,6 @@ func (_m *EC2) DeleteVpcEndpointServiceConfigurations(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpcEndpointServiceConfigurationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5246,6 +5768,10 @@ func (_m *EC2) DeleteVpcEndpoints(ctx context.Context, params *ec2.DeleteVpcEndp ret := _m.Called(_ca...) var r0 *ec2.DeleteVpcEndpointsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcEndpointsInput, ...func(*ec2.Options)) (*ec2.DeleteVpcEndpointsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcEndpointsInput, ...func(*ec2.Options)) *ec2.DeleteVpcEndpointsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5254,7 +5780,6 @@ func (_m *EC2) DeleteVpcEndpoints(ctx context.Context, params *ec2.DeleteVpcEndp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpcEndpointsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5276,6 +5801,10 @@ func (_m *EC2) DeleteVpcPeeringConnection(ctx context.Context, params *ec2.Delet ret := _m.Called(_ca...) var r0 *ec2.DeleteVpcPeeringConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcPeeringConnectionInput, ...func(*ec2.Options)) (*ec2.DeleteVpcPeeringConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpcPeeringConnectionInput, ...func(*ec2.Options)) *ec2.DeleteVpcPeeringConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5284,7 +5813,6 @@ func (_m *EC2) DeleteVpcPeeringConnection(ctx context.Context, params *ec2.Delet } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpcPeeringConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5306,6 +5834,10 @@ func (_m *EC2) DeleteVpnConnection(ctx context.Context, params *ec2.DeleteVpnCon ret := _m.Called(_ca...) var r0 *ec2.DeleteVpnConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpnConnectionInput, ...func(*ec2.Options)) (*ec2.DeleteVpnConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpnConnectionInput, ...func(*ec2.Options)) *ec2.DeleteVpnConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5314,7 +5846,6 @@ func (_m *EC2) DeleteVpnConnection(ctx context.Context, params *ec2.DeleteVpnCon } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpnConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5336,6 +5867,10 @@ func (_m *EC2) DeleteVpnConnectionRoute(ctx context.Context, params *ec2.DeleteV ret := _m.Called(_ca...) var r0 *ec2.DeleteVpnConnectionRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpnConnectionRouteInput, ...func(*ec2.Options)) (*ec2.DeleteVpnConnectionRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpnConnectionRouteInput, ...func(*ec2.Options)) *ec2.DeleteVpnConnectionRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5344,7 +5879,6 @@ func (_m *EC2) DeleteVpnConnectionRoute(ctx context.Context, params *ec2.DeleteV } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpnConnectionRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5366,6 +5900,10 @@ func (_m *EC2) DeleteVpnGateway(ctx context.Context, params *ec2.DeleteVpnGatewa ret := _m.Called(_ca...) var r0 *ec2.DeleteVpnGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpnGatewayInput, ...func(*ec2.Options)) (*ec2.DeleteVpnGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeleteVpnGatewayInput, ...func(*ec2.Options)) *ec2.DeleteVpnGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5374,7 +5912,6 @@ func (_m *EC2) DeleteVpnGateway(ctx context.Context, params *ec2.DeleteVpnGatewa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeleteVpnGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5396,6 +5933,10 @@ func (_m *EC2) DeprovisionByoipCidr(ctx context.Context, params *ec2.Deprovision ret := _m.Called(_ca...) var r0 *ec2.DeprovisionByoipCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeprovisionByoipCidrInput, ...func(*ec2.Options)) (*ec2.DeprovisionByoipCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeprovisionByoipCidrInput, ...func(*ec2.Options)) *ec2.DeprovisionByoipCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5404,7 +5945,6 @@ func (_m *EC2) DeprovisionByoipCidr(ctx context.Context, params *ec2.Deprovision } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeprovisionByoipCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5426,6 +5966,10 @@ func (_m *EC2) DeprovisionIpamPoolCidr(ctx context.Context, params *ec2.Deprovis ret := _m.Called(_ca...) var r0 *ec2.DeprovisionIpamPoolCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeprovisionIpamPoolCidrInput, ...func(*ec2.Options)) (*ec2.DeprovisionIpamPoolCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeprovisionIpamPoolCidrInput, ...func(*ec2.Options)) *ec2.DeprovisionIpamPoolCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5434,7 +5978,6 @@ func (_m *EC2) DeprovisionIpamPoolCidr(ctx context.Context, params *ec2.Deprovis } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeprovisionIpamPoolCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5456,6 +5999,10 @@ func (_m *EC2) DeprovisionPublicIpv4PoolCidr(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DeprovisionPublicIpv4PoolCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeprovisionPublicIpv4PoolCidrInput, ...func(*ec2.Options)) (*ec2.DeprovisionPublicIpv4PoolCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeprovisionPublicIpv4PoolCidrInput, ...func(*ec2.Options)) *ec2.DeprovisionPublicIpv4PoolCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5464,7 +6011,6 @@ func (_m *EC2) DeprovisionPublicIpv4PoolCidr(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeprovisionPublicIpv4PoolCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5486,6 +6032,10 @@ func (_m *EC2) DeregisterImage(ctx context.Context, params *ec2.DeregisterImageI ret := _m.Called(_ca...) var r0 *ec2.DeregisterImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterImageInput, ...func(*ec2.Options)) (*ec2.DeregisterImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterImageInput, ...func(*ec2.Options)) *ec2.DeregisterImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5494,7 +6044,6 @@ func (_m *EC2) DeregisterImage(ctx context.Context, params *ec2.DeregisterImageI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeregisterImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5516,6 +6065,10 @@ func (_m *EC2) DeregisterInstanceEventNotificationAttributes(ctx context.Context ret := _m.Called(_ca...) var r0 *ec2.DeregisterInstanceEventNotificationAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) (*ec2.DeregisterInstanceEventNotificationAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) *ec2.DeregisterInstanceEventNotificationAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5524,7 +6077,6 @@ func (_m *EC2) DeregisterInstanceEventNotificationAttributes(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeregisterInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5546,6 +6098,10 @@ func (_m *EC2) DeregisterTransitGatewayMulticastGroupMembers(ctx context.Context ret := _m.Called(_ca...) var r0 *ec2.DeregisterTransitGatewayMulticastGroupMembersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterTransitGatewayMulticastGroupMembersInput, ...func(*ec2.Options)) (*ec2.DeregisterTransitGatewayMulticastGroupMembersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterTransitGatewayMulticastGroupMembersInput, ...func(*ec2.Options)) *ec2.DeregisterTransitGatewayMulticastGroupMembersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5554,7 +6110,6 @@ func (_m *EC2) DeregisterTransitGatewayMulticastGroupMembers(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeregisterTransitGatewayMulticastGroupMembersInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5576,6 +6131,10 @@ func (_m *EC2) DeregisterTransitGatewayMulticastGroupSources(ctx context.Context ret := _m.Called(_ca...) var r0 *ec2.DeregisterTransitGatewayMulticastGroupSourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterTransitGatewayMulticastGroupSourcesInput, ...func(*ec2.Options)) (*ec2.DeregisterTransitGatewayMulticastGroupSourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DeregisterTransitGatewayMulticastGroupSourcesInput, ...func(*ec2.Options)) *ec2.DeregisterTransitGatewayMulticastGroupSourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5584,7 +6143,6 @@ func (_m *EC2) DeregisterTransitGatewayMulticastGroupSources(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DeregisterTransitGatewayMulticastGroupSourcesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5606,6 +6164,10 @@ func (_m *EC2) DescribeAccountAttributes(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeAccountAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAccountAttributesInput, ...func(*ec2.Options)) (*ec2.DescribeAccountAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAccountAttributesInput, ...func(*ec2.Options)) *ec2.DescribeAccountAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5614,7 +6176,6 @@ func (_m *EC2) DescribeAccountAttributes(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeAccountAttributesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5636,6 +6197,10 @@ func (_m *EC2) DescribeAddresses(ctx context.Context, params *ec2.DescribeAddres ret := _m.Called(_ca...) var r0 *ec2.DescribeAddressesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAddressesInput, ...func(*ec2.Options)) (*ec2.DescribeAddressesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAddressesInput, ...func(*ec2.Options)) *ec2.DescribeAddressesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5644,7 +6209,6 @@ func (_m *EC2) DescribeAddresses(ctx context.Context, params *ec2.DescribeAddres } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeAddressesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5666,6 +6230,10 @@ func (_m *EC2) DescribeAddressesAttribute(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeAddressesAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAddressesAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeAddressesAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAddressesAttributeInput, ...func(*ec2.Options)) *ec2.DescribeAddressesAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5674,7 +6242,6 @@ func (_m *EC2) DescribeAddressesAttribute(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeAddressesAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5696,6 +6263,10 @@ func (_m *EC2) DescribeAggregateIdFormat(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeAggregateIdFormatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAggregateIdFormatInput, ...func(*ec2.Options)) (*ec2.DescribeAggregateIdFormatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAggregateIdFormatInput, ...func(*ec2.Options)) *ec2.DescribeAggregateIdFormatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5704,7 +6275,6 @@ func (_m *EC2) DescribeAggregateIdFormat(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeAggregateIdFormatInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5726,6 +6296,10 @@ func (_m *EC2) DescribeAvailabilityZones(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeAvailabilityZonesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAvailabilityZonesInput, ...func(*ec2.Options)) (*ec2.DescribeAvailabilityZonesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeAvailabilityZonesInput, ...func(*ec2.Options)) *ec2.DescribeAvailabilityZonesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5734,7 +6308,6 @@ func (_m *EC2) DescribeAvailabilityZones(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeAvailabilityZonesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5756,6 +6329,10 @@ func (_m *EC2) DescribeBundleTasks(ctx context.Context, params *ec2.DescribeBund ret := _m.Called(_ca...) var r0 *ec2.DescribeBundleTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeBundleTasksInput, ...func(*ec2.Options)) (*ec2.DescribeBundleTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeBundleTasksInput, ...func(*ec2.Options)) *ec2.DescribeBundleTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5764,7 +6341,6 @@ func (_m *EC2) DescribeBundleTasks(ctx context.Context, params *ec2.DescribeBund } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeBundleTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5786,6 +6362,10 @@ func (_m *EC2) DescribeByoipCidrs(ctx context.Context, params *ec2.DescribeByoip ret := _m.Called(_ca...) var r0 *ec2.DescribeByoipCidrsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeByoipCidrsInput, ...func(*ec2.Options)) (*ec2.DescribeByoipCidrsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeByoipCidrsInput, ...func(*ec2.Options)) *ec2.DescribeByoipCidrsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5794,7 +6374,6 @@ func (_m *EC2) DescribeByoipCidrs(ctx context.Context, params *ec2.DescribeByoip } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeByoipCidrsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5816,6 +6395,10 @@ func (_m *EC2) DescribeCapacityReservationFleets(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.DescribeCapacityReservationFleetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCapacityReservationFleetsInput, ...func(*ec2.Options)) (*ec2.DescribeCapacityReservationFleetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCapacityReservationFleetsInput, ...func(*ec2.Options)) *ec2.DescribeCapacityReservationFleetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5824,7 +6407,6 @@ func (_m *EC2) DescribeCapacityReservationFleets(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeCapacityReservationFleetsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5846,6 +6428,10 @@ func (_m *EC2) DescribeCapacityReservations(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeCapacityReservationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCapacityReservationsInput, ...func(*ec2.Options)) (*ec2.DescribeCapacityReservationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCapacityReservationsInput, ...func(*ec2.Options)) *ec2.DescribeCapacityReservationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5854,7 +6440,6 @@ func (_m *EC2) DescribeCapacityReservations(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeCapacityReservationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5876,6 +6461,10 @@ func (_m *EC2) DescribeCarrierGateways(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeCarrierGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCarrierGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeCarrierGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCarrierGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeCarrierGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5884,7 +6473,6 @@ func (_m *EC2) DescribeCarrierGateways(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeCarrierGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5906,6 +6494,10 @@ func (_m *EC2) DescribeClassicLinkInstances(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeClassicLinkInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClassicLinkInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeClassicLinkInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClassicLinkInstancesInput, ...func(*ec2.Options)) *ec2.DescribeClassicLinkInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5914,7 +6506,6 @@ func (_m *EC2) DescribeClassicLinkInstances(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeClassicLinkInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5936,6 +6527,10 @@ func (_m *EC2) DescribeClientVpnAuthorizationRules(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.DescribeClientVpnAuthorizationRulesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnAuthorizationRulesInput, ...func(*ec2.Options)) (*ec2.DescribeClientVpnAuthorizationRulesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnAuthorizationRulesInput, ...func(*ec2.Options)) *ec2.DescribeClientVpnAuthorizationRulesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5944,7 +6539,6 @@ func (_m *EC2) DescribeClientVpnAuthorizationRules(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeClientVpnAuthorizationRulesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5966,6 +6560,10 @@ func (_m *EC2) DescribeClientVpnConnections(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeClientVpnConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnConnectionsInput, ...func(*ec2.Options)) (*ec2.DescribeClientVpnConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnConnectionsInput, ...func(*ec2.Options)) *ec2.DescribeClientVpnConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -5974,7 +6572,6 @@ func (_m *EC2) DescribeClientVpnConnections(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeClientVpnConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -5996,6 +6593,10 @@ func (_m *EC2) DescribeClientVpnEndpoints(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeClientVpnEndpointsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnEndpointsInput, ...func(*ec2.Options)) (*ec2.DescribeClientVpnEndpointsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnEndpointsInput, ...func(*ec2.Options)) *ec2.DescribeClientVpnEndpointsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6004,7 +6605,6 @@ func (_m *EC2) DescribeClientVpnEndpoints(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeClientVpnEndpointsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6026,6 +6626,10 @@ func (_m *EC2) DescribeClientVpnRoutes(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeClientVpnRoutesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnRoutesInput, ...func(*ec2.Options)) (*ec2.DescribeClientVpnRoutesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnRoutesInput, ...func(*ec2.Options)) *ec2.DescribeClientVpnRoutesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6034,7 +6638,6 @@ func (_m *EC2) DescribeClientVpnRoutes(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeClientVpnRoutesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6056,6 +6659,10 @@ func (_m *EC2) DescribeClientVpnTargetNetworks(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DescribeClientVpnTargetNetworksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnTargetNetworksInput, ...func(*ec2.Options)) (*ec2.DescribeClientVpnTargetNetworksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeClientVpnTargetNetworksInput, ...func(*ec2.Options)) *ec2.DescribeClientVpnTargetNetworksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6064,7 +6671,6 @@ func (_m *EC2) DescribeClientVpnTargetNetworks(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeClientVpnTargetNetworksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6086,6 +6692,10 @@ func (_m *EC2) DescribeCoipPools(ctx context.Context, params *ec2.DescribeCoipPo ret := _m.Called(_ca...) var r0 *ec2.DescribeCoipPoolsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCoipPoolsInput, ...func(*ec2.Options)) (*ec2.DescribeCoipPoolsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCoipPoolsInput, ...func(*ec2.Options)) *ec2.DescribeCoipPoolsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6094,7 +6704,6 @@ func (_m *EC2) DescribeCoipPools(ctx context.Context, params *ec2.DescribeCoipPo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeCoipPoolsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6116,6 +6725,10 @@ func (_m *EC2) DescribeConversionTasks(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeConversionTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeConversionTasksInput, ...func(*ec2.Options)) (*ec2.DescribeConversionTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeConversionTasksInput, ...func(*ec2.Options)) *ec2.DescribeConversionTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6124,7 +6737,6 @@ func (_m *EC2) DescribeConversionTasks(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeConversionTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6146,6 +6758,10 @@ func (_m *EC2) DescribeCustomerGateways(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeCustomerGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCustomerGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeCustomerGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeCustomerGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeCustomerGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6154,7 +6770,6 @@ func (_m *EC2) DescribeCustomerGateways(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeCustomerGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6176,6 +6791,10 @@ func (_m *EC2) DescribeDhcpOptions(ctx context.Context, params *ec2.DescribeDhcp ret := _m.Called(_ca...) var r0 *ec2.DescribeDhcpOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeDhcpOptionsInput, ...func(*ec2.Options)) (*ec2.DescribeDhcpOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeDhcpOptionsInput, ...func(*ec2.Options)) *ec2.DescribeDhcpOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6184,7 +6803,6 @@ func (_m *EC2) DescribeDhcpOptions(ctx context.Context, params *ec2.DescribeDhcp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeDhcpOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6206,6 +6824,10 @@ func (_m *EC2) DescribeEgressOnlyInternetGateways(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.DescribeEgressOnlyInternetGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeEgressOnlyInternetGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeEgressOnlyInternetGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeEgressOnlyInternetGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeEgressOnlyInternetGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6214,7 +6836,6 @@ func (_m *EC2) DescribeEgressOnlyInternetGateways(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeEgressOnlyInternetGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6236,6 +6857,10 @@ func (_m *EC2) DescribeElasticGpus(ctx context.Context, params *ec2.DescribeElas ret := _m.Called(_ca...) var r0 *ec2.DescribeElasticGpusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeElasticGpusInput, ...func(*ec2.Options)) (*ec2.DescribeElasticGpusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeElasticGpusInput, ...func(*ec2.Options)) *ec2.DescribeElasticGpusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6244,7 +6869,6 @@ func (_m *EC2) DescribeElasticGpus(ctx context.Context, params *ec2.DescribeElas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeElasticGpusInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6266,6 +6890,10 @@ func (_m *EC2) DescribeExportImageTasks(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeExportImageTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeExportImageTasksInput, ...func(*ec2.Options)) (*ec2.DescribeExportImageTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeExportImageTasksInput, ...func(*ec2.Options)) *ec2.DescribeExportImageTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6274,7 +6902,6 @@ func (_m *EC2) DescribeExportImageTasks(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeExportImageTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6296,6 +6923,10 @@ func (_m *EC2) DescribeExportTasks(ctx context.Context, params *ec2.DescribeExpo ret := _m.Called(_ca...) var r0 *ec2.DescribeExportTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeExportTasksInput, ...func(*ec2.Options)) (*ec2.DescribeExportTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeExportTasksInput, ...func(*ec2.Options)) *ec2.DescribeExportTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6304,7 +6935,6 @@ func (_m *EC2) DescribeExportTasks(ctx context.Context, params *ec2.DescribeExpo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeExportTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6326,6 +6956,10 @@ func (_m *EC2) DescribeFastLaunchImages(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeFastLaunchImagesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFastLaunchImagesInput, ...func(*ec2.Options)) (*ec2.DescribeFastLaunchImagesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFastLaunchImagesInput, ...func(*ec2.Options)) *ec2.DescribeFastLaunchImagesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6334,7 +6968,6 @@ func (_m *EC2) DescribeFastLaunchImages(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFastLaunchImagesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6356,6 +6989,10 @@ func (_m *EC2) DescribeFastSnapshotRestores(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeFastSnapshotRestoresOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFastSnapshotRestoresInput, ...func(*ec2.Options)) (*ec2.DescribeFastSnapshotRestoresOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFastSnapshotRestoresInput, ...func(*ec2.Options)) *ec2.DescribeFastSnapshotRestoresOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6364,7 +7001,6 @@ func (_m *EC2) DescribeFastSnapshotRestores(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFastSnapshotRestoresInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6386,6 +7022,10 @@ func (_m *EC2) DescribeFleetHistory(ctx context.Context, params *ec2.DescribeFle ret := _m.Called(_ca...) var r0 *ec2.DescribeFleetHistoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFleetHistoryInput, ...func(*ec2.Options)) (*ec2.DescribeFleetHistoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFleetHistoryInput, ...func(*ec2.Options)) *ec2.DescribeFleetHistoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6394,7 +7034,6 @@ func (_m *EC2) DescribeFleetHistory(ctx context.Context, params *ec2.DescribeFle } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFleetHistoryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6416,6 +7055,10 @@ func (_m *EC2) DescribeFleetInstances(ctx context.Context, params *ec2.DescribeF ret := _m.Called(_ca...) var r0 *ec2.DescribeFleetInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFleetInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeFleetInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFleetInstancesInput, ...func(*ec2.Options)) *ec2.DescribeFleetInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6424,7 +7067,6 @@ func (_m *EC2) DescribeFleetInstances(ctx context.Context, params *ec2.DescribeF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFleetInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6446,6 +7088,10 @@ func (_m *EC2) DescribeFleets(ctx context.Context, params *ec2.DescribeFleetsInp ret := _m.Called(_ca...) var r0 *ec2.DescribeFleetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFleetsInput, ...func(*ec2.Options)) (*ec2.DescribeFleetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFleetsInput, ...func(*ec2.Options)) *ec2.DescribeFleetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6454,7 +7100,6 @@ func (_m *EC2) DescribeFleets(ctx context.Context, params *ec2.DescribeFleetsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFleetsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6476,6 +7121,10 @@ func (_m *EC2) DescribeFlowLogs(ctx context.Context, params *ec2.DescribeFlowLog ret := _m.Called(_ca...) var r0 *ec2.DescribeFlowLogsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFlowLogsInput, ...func(*ec2.Options)) (*ec2.DescribeFlowLogsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFlowLogsInput, ...func(*ec2.Options)) *ec2.DescribeFlowLogsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6484,7 +7133,6 @@ func (_m *EC2) DescribeFlowLogs(ctx context.Context, params *ec2.DescribeFlowLog } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFlowLogsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6506,6 +7154,10 @@ func (_m *EC2) DescribeFpgaImageAttribute(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeFpgaImageAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFpgaImageAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeFpgaImageAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFpgaImageAttributeInput, ...func(*ec2.Options)) *ec2.DescribeFpgaImageAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6514,7 +7166,6 @@ func (_m *EC2) DescribeFpgaImageAttribute(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFpgaImageAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6536,6 +7187,10 @@ func (_m *EC2) DescribeFpgaImages(ctx context.Context, params *ec2.DescribeFpgaI ret := _m.Called(_ca...) var r0 *ec2.DescribeFpgaImagesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFpgaImagesInput, ...func(*ec2.Options)) (*ec2.DescribeFpgaImagesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeFpgaImagesInput, ...func(*ec2.Options)) *ec2.DescribeFpgaImagesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6544,7 +7199,6 @@ func (_m *EC2) DescribeFpgaImages(ctx context.Context, params *ec2.DescribeFpgaI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeFpgaImagesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6566,6 +7220,10 @@ func (_m *EC2) DescribeHostReservationOfferings(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.DescribeHostReservationOfferingsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeHostReservationOfferingsInput, ...func(*ec2.Options)) (*ec2.DescribeHostReservationOfferingsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeHostReservationOfferingsInput, ...func(*ec2.Options)) *ec2.DescribeHostReservationOfferingsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6574,7 +7232,6 @@ func (_m *EC2) DescribeHostReservationOfferings(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeHostReservationOfferingsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6596,6 +7253,10 @@ func (_m *EC2) DescribeHostReservations(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeHostReservationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeHostReservationsInput, ...func(*ec2.Options)) (*ec2.DescribeHostReservationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeHostReservationsInput, ...func(*ec2.Options)) *ec2.DescribeHostReservationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6604,7 +7265,6 @@ func (_m *EC2) DescribeHostReservations(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeHostReservationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6626,6 +7286,10 @@ func (_m *EC2) DescribeHosts(ctx context.Context, params *ec2.DescribeHostsInput ret := _m.Called(_ca...) var r0 *ec2.DescribeHostsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeHostsInput, ...func(*ec2.Options)) (*ec2.DescribeHostsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeHostsInput, ...func(*ec2.Options)) *ec2.DescribeHostsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6634,7 +7298,6 @@ func (_m *EC2) DescribeHosts(ctx context.Context, params *ec2.DescribeHostsInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeHostsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6656,6 +7319,10 @@ func (_m *EC2) DescribeIamInstanceProfileAssociations(ctx context.Context, param ret := _m.Called(_ca...) var r0 *ec2.DescribeIamInstanceProfileAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIamInstanceProfileAssociationsInput, ...func(*ec2.Options)) (*ec2.DescribeIamInstanceProfileAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIamInstanceProfileAssociationsInput, ...func(*ec2.Options)) *ec2.DescribeIamInstanceProfileAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6664,7 +7331,6 @@ func (_m *EC2) DescribeIamInstanceProfileAssociations(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIamInstanceProfileAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6686,6 +7352,10 @@ func (_m *EC2) DescribeIdFormat(ctx context.Context, params *ec2.DescribeIdForma ret := _m.Called(_ca...) var r0 *ec2.DescribeIdFormatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIdFormatInput, ...func(*ec2.Options)) (*ec2.DescribeIdFormatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIdFormatInput, ...func(*ec2.Options)) *ec2.DescribeIdFormatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6694,7 +7364,6 @@ func (_m *EC2) DescribeIdFormat(ctx context.Context, params *ec2.DescribeIdForma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIdFormatInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6716,6 +7385,10 @@ func (_m *EC2) DescribeIdentityIdFormat(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeIdentityIdFormatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIdentityIdFormatInput, ...func(*ec2.Options)) (*ec2.DescribeIdentityIdFormatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIdentityIdFormatInput, ...func(*ec2.Options)) *ec2.DescribeIdentityIdFormatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6724,7 +7397,6 @@ func (_m *EC2) DescribeIdentityIdFormat(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIdentityIdFormatInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6746,6 +7418,10 @@ func (_m *EC2) DescribeImageAttribute(ctx context.Context, params *ec2.DescribeI ret := _m.Called(_ca...) var r0 *ec2.DescribeImageAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImageAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeImageAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImageAttributeInput, ...func(*ec2.Options)) *ec2.DescribeImageAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6754,7 +7430,6 @@ func (_m *EC2) DescribeImageAttribute(ctx context.Context, params *ec2.DescribeI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeImageAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6776,6 +7451,10 @@ func (_m *EC2) DescribeImages(ctx context.Context, params *ec2.DescribeImagesInp ret := _m.Called(_ca...) var r0 *ec2.DescribeImagesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImagesInput, ...func(*ec2.Options)) (*ec2.DescribeImagesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImagesInput, ...func(*ec2.Options)) *ec2.DescribeImagesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6784,7 +7463,6 @@ func (_m *EC2) DescribeImages(ctx context.Context, params *ec2.DescribeImagesInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeImagesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6806,6 +7484,10 @@ func (_m *EC2) DescribeImportImageTasks(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeImportImageTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImportImageTasksInput, ...func(*ec2.Options)) (*ec2.DescribeImportImageTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImportImageTasksInput, ...func(*ec2.Options)) *ec2.DescribeImportImageTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6814,7 +7496,6 @@ func (_m *EC2) DescribeImportImageTasks(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeImportImageTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6836,6 +7517,10 @@ func (_m *EC2) DescribeImportSnapshotTasks(ctx context.Context, params *ec2.Desc ret := _m.Called(_ca...) var r0 *ec2.DescribeImportSnapshotTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImportSnapshotTasksInput, ...func(*ec2.Options)) (*ec2.DescribeImportSnapshotTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeImportSnapshotTasksInput, ...func(*ec2.Options)) *ec2.DescribeImportSnapshotTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6844,7 +7529,6 @@ func (_m *EC2) DescribeImportSnapshotTasks(ctx context.Context, params *ec2.Desc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeImportSnapshotTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6866,6 +7550,10 @@ func (_m *EC2) DescribeInstanceAttribute(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceAttributeInput, ...func(*ec2.Options)) *ec2.DescribeInstanceAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6874,7 +7562,6 @@ func (_m *EC2) DescribeInstanceAttribute(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6896,6 +7583,10 @@ func (_m *EC2) DescribeInstanceCreditSpecifications(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceCreditSpecificationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceCreditSpecificationsInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceCreditSpecificationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceCreditSpecificationsInput, ...func(*ec2.Options)) *ec2.DescribeInstanceCreditSpecificationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6904,7 +7595,6 @@ func (_m *EC2) DescribeInstanceCreditSpecifications(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceCreditSpecificationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6926,6 +7616,10 @@ func (_m *EC2) DescribeInstanceEventNotificationAttributes(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceEventNotificationAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceEventNotificationAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) *ec2.DescribeInstanceEventNotificationAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6934,7 +7628,6 @@ func (_m *EC2) DescribeInstanceEventNotificationAttributes(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6956,6 +7649,10 @@ func (_m *EC2) DescribeInstanceEventWindows(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceEventWindowsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceEventWindowsInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceEventWindowsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceEventWindowsInput, ...func(*ec2.Options)) *ec2.DescribeInstanceEventWindowsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6964,7 +7661,6 @@ func (_m *EC2) DescribeInstanceEventWindows(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceEventWindowsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -6986,6 +7682,10 @@ func (_m *EC2) DescribeInstanceStatus(ctx context.Context, params *ec2.DescribeI ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceStatusInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceStatusInput, ...func(*ec2.Options)) *ec2.DescribeInstanceStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -6994,7 +7694,6 @@ func (_m *EC2) DescribeInstanceStatus(ctx context.Context, params *ec2.DescribeI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceStatusInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7016,6 +7715,10 @@ func (_m *EC2) DescribeInstanceTypeOfferings(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceTypeOfferingsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceTypeOfferingsInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceTypeOfferingsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceTypeOfferingsInput, ...func(*ec2.Options)) *ec2.DescribeInstanceTypeOfferingsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7024,7 +7727,6 @@ func (_m *EC2) DescribeInstanceTypeOfferings(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceTypeOfferingsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7046,6 +7748,10 @@ func (_m *EC2) DescribeInstanceTypes(ctx context.Context, params *ec2.DescribeIn ret := _m.Called(_ca...) var r0 *ec2.DescribeInstanceTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceTypesInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstanceTypesInput, ...func(*ec2.Options)) *ec2.DescribeInstanceTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7054,7 +7760,6 @@ func (_m *EC2) DescribeInstanceTypes(ctx context.Context, params *ec2.DescribeIn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstanceTypesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7076,6 +7781,10 @@ func (_m *EC2) DescribeInstances(ctx context.Context, params *ec2.DescribeInstan ret := _m.Called(_ca...) var r0 *ec2.DescribeInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInstancesInput, ...func(*ec2.Options)) *ec2.DescribeInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7084,7 +7793,6 @@ func (_m *EC2) DescribeInstances(ctx context.Context, params *ec2.DescribeInstan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7106,6 +7814,10 @@ func (_m *EC2) DescribeInternetGateways(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeInternetGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInternetGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeInternetGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeInternetGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeInternetGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7114,7 +7826,6 @@ func (_m *EC2) DescribeInternetGateways(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeInternetGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7136,6 +7847,10 @@ func (_m *EC2) DescribeIpamPools(ctx context.Context, params *ec2.DescribeIpamPo ret := _m.Called(_ca...) var r0 *ec2.DescribeIpamPoolsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpamPoolsInput, ...func(*ec2.Options)) (*ec2.DescribeIpamPoolsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpamPoolsInput, ...func(*ec2.Options)) *ec2.DescribeIpamPoolsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7144,7 +7859,6 @@ func (_m *EC2) DescribeIpamPools(ctx context.Context, params *ec2.DescribeIpamPo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIpamPoolsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7166,6 +7880,10 @@ func (_m *EC2) DescribeIpamScopes(ctx context.Context, params *ec2.DescribeIpamS ret := _m.Called(_ca...) var r0 *ec2.DescribeIpamScopesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpamScopesInput, ...func(*ec2.Options)) (*ec2.DescribeIpamScopesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpamScopesInput, ...func(*ec2.Options)) *ec2.DescribeIpamScopesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7174,7 +7892,6 @@ func (_m *EC2) DescribeIpamScopes(ctx context.Context, params *ec2.DescribeIpamS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIpamScopesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7196,6 +7913,10 @@ func (_m *EC2) DescribeIpams(ctx context.Context, params *ec2.DescribeIpamsInput ret := _m.Called(_ca...) var r0 *ec2.DescribeIpamsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpamsInput, ...func(*ec2.Options)) (*ec2.DescribeIpamsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpamsInput, ...func(*ec2.Options)) *ec2.DescribeIpamsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7204,7 +7925,6 @@ func (_m *EC2) DescribeIpams(ctx context.Context, params *ec2.DescribeIpamsInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIpamsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7226,6 +7946,10 @@ func (_m *EC2) DescribeIpv6Pools(ctx context.Context, params *ec2.DescribeIpv6Po ret := _m.Called(_ca...) var r0 *ec2.DescribeIpv6PoolsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpv6PoolsInput, ...func(*ec2.Options)) (*ec2.DescribeIpv6PoolsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeIpv6PoolsInput, ...func(*ec2.Options)) *ec2.DescribeIpv6PoolsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7234,7 +7958,6 @@ func (_m *EC2) DescribeIpv6Pools(ctx context.Context, params *ec2.DescribeIpv6Po } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeIpv6PoolsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7256,6 +7979,10 @@ func (_m *EC2) DescribeKeyPairs(ctx context.Context, params *ec2.DescribeKeyPair ret := _m.Called(_ca...) var r0 *ec2.DescribeKeyPairsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeKeyPairsInput, ...func(*ec2.Options)) (*ec2.DescribeKeyPairsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeKeyPairsInput, ...func(*ec2.Options)) *ec2.DescribeKeyPairsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7264,7 +7991,6 @@ func (_m *EC2) DescribeKeyPairs(ctx context.Context, params *ec2.DescribeKeyPair } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeKeyPairsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7286,6 +8012,10 @@ func (_m *EC2) DescribeLaunchTemplateVersions(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DescribeLaunchTemplateVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLaunchTemplateVersionsInput, ...func(*ec2.Options)) (*ec2.DescribeLaunchTemplateVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLaunchTemplateVersionsInput, ...func(*ec2.Options)) *ec2.DescribeLaunchTemplateVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7294,7 +8024,6 @@ func (_m *EC2) DescribeLaunchTemplateVersions(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLaunchTemplateVersionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7316,6 +8045,10 @@ func (_m *EC2) DescribeLaunchTemplates(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeLaunchTemplatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLaunchTemplatesInput, ...func(*ec2.Options)) (*ec2.DescribeLaunchTemplatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLaunchTemplatesInput, ...func(*ec2.Options)) *ec2.DescribeLaunchTemplatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7324,7 +8057,6 @@ func (_m *EC2) DescribeLaunchTemplates(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLaunchTemplatesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7346,6 +8078,10 @@ func (_m *EC2) DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations(c ret := _m.Called(_ca...) var r0 *ec2.DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsInput, ...func(*ec2.Options)) (*ec2.DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsInput, ...func(*ec2.Options)) *ec2.DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7354,7 +8090,6 @@ func (_m *EC2) DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations(c } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7376,6 +8111,10 @@ func (_m *EC2) DescribeLocalGatewayRouteTableVpcAssociations(ctx context.Context ret := _m.Called(_ca...) var r0 *ec2.DescribeLocalGatewayRouteTableVpcAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayRouteTableVpcAssociationsInput, ...func(*ec2.Options)) (*ec2.DescribeLocalGatewayRouteTableVpcAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayRouteTableVpcAssociationsInput, ...func(*ec2.Options)) *ec2.DescribeLocalGatewayRouteTableVpcAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7384,7 +8123,6 @@ func (_m *EC2) DescribeLocalGatewayRouteTableVpcAssociations(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLocalGatewayRouteTableVpcAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7406,6 +8144,10 @@ func (_m *EC2) DescribeLocalGatewayRouteTables(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DescribeLocalGatewayRouteTablesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayRouteTablesInput, ...func(*ec2.Options)) (*ec2.DescribeLocalGatewayRouteTablesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayRouteTablesInput, ...func(*ec2.Options)) *ec2.DescribeLocalGatewayRouteTablesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7414,7 +8156,6 @@ func (_m *EC2) DescribeLocalGatewayRouteTables(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLocalGatewayRouteTablesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7436,6 +8177,10 @@ func (_m *EC2) DescribeLocalGatewayVirtualInterfaceGroups(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.DescribeLocalGatewayVirtualInterfaceGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayVirtualInterfaceGroupsInput, ...func(*ec2.Options)) (*ec2.DescribeLocalGatewayVirtualInterfaceGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayVirtualInterfaceGroupsInput, ...func(*ec2.Options)) *ec2.DescribeLocalGatewayVirtualInterfaceGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7444,7 +8189,6 @@ func (_m *EC2) DescribeLocalGatewayVirtualInterfaceGroups(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLocalGatewayVirtualInterfaceGroupsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7466,6 +8210,10 @@ func (_m *EC2) DescribeLocalGatewayVirtualInterfaces(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DescribeLocalGatewayVirtualInterfacesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayVirtualInterfacesInput, ...func(*ec2.Options)) (*ec2.DescribeLocalGatewayVirtualInterfacesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewayVirtualInterfacesInput, ...func(*ec2.Options)) *ec2.DescribeLocalGatewayVirtualInterfacesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7474,7 +8222,6 @@ func (_m *EC2) DescribeLocalGatewayVirtualInterfaces(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLocalGatewayVirtualInterfacesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7496,6 +8243,10 @@ func (_m *EC2) DescribeLocalGateways(ctx context.Context, params *ec2.DescribeLo ret := _m.Called(_ca...) var r0 *ec2.DescribeLocalGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeLocalGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeLocalGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeLocalGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7504,7 +8255,6 @@ func (_m *EC2) DescribeLocalGateways(ctx context.Context, params *ec2.DescribeLo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeLocalGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7526,6 +8276,10 @@ func (_m *EC2) DescribeManagedPrefixLists(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeManagedPrefixListsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeManagedPrefixListsInput, ...func(*ec2.Options)) (*ec2.DescribeManagedPrefixListsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeManagedPrefixListsInput, ...func(*ec2.Options)) *ec2.DescribeManagedPrefixListsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7534,7 +8288,6 @@ func (_m *EC2) DescribeManagedPrefixLists(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeManagedPrefixListsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7556,6 +8309,10 @@ func (_m *EC2) DescribeMovingAddresses(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeMovingAddressesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeMovingAddressesInput, ...func(*ec2.Options)) (*ec2.DescribeMovingAddressesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeMovingAddressesInput, ...func(*ec2.Options)) *ec2.DescribeMovingAddressesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7564,7 +8321,6 @@ func (_m *EC2) DescribeMovingAddresses(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeMovingAddressesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7586,6 +8342,10 @@ func (_m *EC2) DescribeNatGateways(ctx context.Context, params *ec2.DescribeNatG ret := _m.Called(_ca...) var r0 *ec2.DescribeNatGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNatGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeNatGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNatGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeNatGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7594,7 +8354,6 @@ func (_m *EC2) DescribeNatGateways(ctx context.Context, params *ec2.DescribeNatG } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNatGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7616,6 +8375,10 @@ func (_m *EC2) DescribeNetworkAcls(ctx context.Context, params *ec2.DescribeNetw ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkAclsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkAclsInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkAclsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkAclsInput, ...func(*ec2.Options)) *ec2.DescribeNetworkAclsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7624,7 +8387,6 @@ func (_m *EC2) DescribeNetworkAcls(ctx context.Context, params *ec2.DescribeNetw } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkAclsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7646,6 +8408,10 @@ func (_m *EC2) DescribeNetworkInsightsAccessScopeAnalyses(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInsightsAccessScopeAnalysesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopeAnalysesInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInsightsAccessScopeAnalysesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopeAnalysesInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInsightsAccessScopeAnalysesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7654,7 +8420,6 @@ func (_m *EC2) DescribeNetworkInsightsAccessScopeAnalyses(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopeAnalysesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7676,7 +8441,11 @@ func (_m *EC2) DescribeNetworkInsightsAccessScopes(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInsightsAccessScopesOutput - if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopesInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInsightsAccessScopesOutput); ok { + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopesInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInsightsAccessScopesOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopesInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInsightsAccessScopesOutput); ok { r0 = rf(ctx, params, optFns...) } else { if ret.Get(0) != nil { @@ -7684,7 +8453,6 @@ func (_m *EC2) DescribeNetworkInsightsAccessScopes(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInsightsAccessScopesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7706,6 +8474,10 @@ func (_m *EC2) DescribeNetworkInsightsAnalyses(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInsightsAnalysesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAnalysesInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInsightsAnalysesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsAnalysesInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInsightsAnalysesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7714,7 +8486,6 @@ func (_m *EC2) DescribeNetworkInsightsAnalyses(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInsightsAnalysesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7736,6 +8507,10 @@ func (_m *EC2) DescribeNetworkInsightsPaths(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInsightsPathsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsPathsInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInsightsPathsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInsightsPathsInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInsightsPathsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7744,7 +8519,6 @@ func (_m *EC2) DescribeNetworkInsightsPaths(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInsightsPathsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7766,6 +8540,10 @@ func (_m *EC2) DescribeNetworkInterfaceAttribute(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInterfaceAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInterfaceAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInterfaceAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInterfaceAttributeInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInterfaceAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7774,7 +8552,6 @@ func (_m *EC2) DescribeNetworkInterfaceAttribute(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInterfaceAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7796,6 +8573,10 @@ func (_m *EC2) DescribeNetworkInterfacePermissions(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInterfacePermissionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInterfacePermissionsInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInterfacePermissionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInterfacePermissionsInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInterfacePermissionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7804,7 +8585,6 @@ func (_m *EC2) DescribeNetworkInterfacePermissions(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInterfacePermissionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7826,6 +8606,10 @@ func (_m *EC2) DescribeNetworkInterfaces(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeNetworkInterfacesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInterfacesInput, ...func(*ec2.Options)) (*ec2.DescribeNetworkInterfacesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeNetworkInterfacesInput, ...func(*ec2.Options)) *ec2.DescribeNetworkInterfacesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7834,7 +8618,6 @@ func (_m *EC2) DescribeNetworkInterfaces(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeNetworkInterfacesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7856,6 +8639,10 @@ func (_m *EC2) DescribePlacementGroups(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribePlacementGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePlacementGroupsInput, ...func(*ec2.Options)) (*ec2.DescribePlacementGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePlacementGroupsInput, ...func(*ec2.Options)) *ec2.DescribePlacementGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7864,7 +8651,6 @@ func (_m *EC2) DescribePlacementGroups(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribePlacementGroupsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7886,6 +8672,10 @@ func (_m *EC2) DescribePrefixLists(ctx context.Context, params *ec2.DescribePref ret := _m.Called(_ca...) var r0 *ec2.DescribePrefixListsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePrefixListsInput, ...func(*ec2.Options)) (*ec2.DescribePrefixListsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePrefixListsInput, ...func(*ec2.Options)) *ec2.DescribePrefixListsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7894,7 +8684,6 @@ func (_m *EC2) DescribePrefixLists(ctx context.Context, params *ec2.DescribePref } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribePrefixListsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7916,6 +8705,10 @@ func (_m *EC2) DescribePrincipalIdFormat(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribePrincipalIdFormatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePrincipalIdFormatInput, ...func(*ec2.Options)) (*ec2.DescribePrincipalIdFormatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePrincipalIdFormatInput, ...func(*ec2.Options)) *ec2.DescribePrincipalIdFormatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7924,7 +8717,6 @@ func (_m *EC2) DescribePrincipalIdFormat(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribePrincipalIdFormatInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7946,6 +8738,10 @@ func (_m *EC2) DescribePublicIpv4Pools(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribePublicIpv4PoolsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePublicIpv4PoolsInput, ...func(*ec2.Options)) (*ec2.DescribePublicIpv4PoolsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribePublicIpv4PoolsInput, ...func(*ec2.Options)) *ec2.DescribePublicIpv4PoolsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7954,7 +8750,6 @@ func (_m *EC2) DescribePublicIpv4Pools(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribePublicIpv4PoolsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -7976,6 +8771,10 @@ func (_m *EC2) DescribeRegions(ctx context.Context, params *ec2.DescribeRegionsI ret := _m.Called(_ca...) var r0 *ec2.DescribeRegionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeRegionsInput, ...func(*ec2.Options)) (*ec2.DescribeRegionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeRegionsInput, ...func(*ec2.Options)) *ec2.DescribeRegionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -7984,7 +8783,6 @@ func (_m *EC2) DescribeRegions(ctx context.Context, params *ec2.DescribeRegionsI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeRegionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8006,6 +8804,10 @@ func (_m *EC2) DescribeReplaceRootVolumeTasks(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DescribeReplaceRootVolumeTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReplaceRootVolumeTasksInput, ...func(*ec2.Options)) (*ec2.DescribeReplaceRootVolumeTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReplaceRootVolumeTasksInput, ...func(*ec2.Options)) *ec2.DescribeReplaceRootVolumeTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8014,7 +8816,6 @@ func (_m *EC2) DescribeReplaceRootVolumeTasks(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeReplaceRootVolumeTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8036,6 +8837,10 @@ func (_m *EC2) DescribeReservedInstances(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeReservedInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeReservedInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesInput, ...func(*ec2.Options)) *ec2.DescribeReservedInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8044,7 +8849,6 @@ func (_m *EC2) DescribeReservedInstances(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeReservedInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8066,6 +8870,10 @@ func (_m *EC2) DescribeReservedInstancesListings(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.DescribeReservedInstancesListingsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesListingsInput, ...func(*ec2.Options)) (*ec2.DescribeReservedInstancesListingsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesListingsInput, ...func(*ec2.Options)) *ec2.DescribeReservedInstancesListingsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8074,7 +8882,6 @@ func (_m *EC2) DescribeReservedInstancesListings(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeReservedInstancesListingsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8096,6 +8903,10 @@ func (_m *EC2) DescribeReservedInstancesModifications(ctx context.Context, param ret := _m.Called(_ca...) var r0 *ec2.DescribeReservedInstancesModificationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesModificationsInput, ...func(*ec2.Options)) (*ec2.DescribeReservedInstancesModificationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesModificationsInput, ...func(*ec2.Options)) *ec2.DescribeReservedInstancesModificationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8104,7 +8915,6 @@ func (_m *EC2) DescribeReservedInstancesModifications(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeReservedInstancesModificationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8126,6 +8936,10 @@ func (_m *EC2) DescribeReservedInstancesOfferings(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.DescribeReservedInstancesOfferingsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesOfferingsInput, ...func(*ec2.Options)) (*ec2.DescribeReservedInstancesOfferingsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeReservedInstancesOfferingsInput, ...func(*ec2.Options)) *ec2.DescribeReservedInstancesOfferingsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8134,7 +8948,6 @@ func (_m *EC2) DescribeReservedInstancesOfferings(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeReservedInstancesOfferingsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8156,6 +8969,10 @@ func (_m *EC2) DescribeRouteTables(ctx context.Context, params *ec2.DescribeRout ret := _m.Called(_ca...) var r0 *ec2.DescribeRouteTablesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeRouteTablesInput, ...func(*ec2.Options)) (*ec2.DescribeRouteTablesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeRouteTablesInput, ...func(*ec2.Options)) *ec2.DescribeRouteTablesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8164,7 +8981,6 @@ func (_m *EC2) DescribeRouteTables(ctx context.Context, params *ec2.DescribeRout } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeRouteTablesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8186,6 +9002,10 @@ func (_m *EC2) DescribeScheduledInstanceAvailability(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DescribeScheduledInstanceAvailabilityOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeScheduledInstanceAvailabilityInput, ...func(*ec2.Options)) (*ec2.DescribeScheduledInstanceAvailabilityOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeScheduledInstanceAvailabilityInput, ...func(*ec2.Options)) *ec2.DescribeScheduledInstanceAvailabilityOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8194,7 +9014,6 @@ func (_m *EC2) DescribeScheduledInstanceAvailability(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeScheduledInstanceAvailabilityInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8216,6 +9035,10 @@ func (_m *EC2) DescribeScheduledInstances(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeScheduledInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeScheduledInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeScheduledInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeScheduledInstancesInput, ...func(*ec2.Options)) *ec2.DescribeScheduledInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8224,7 +9047,6 @@ func (_m *EC2) DescribeScheduledInstances(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeScheduledInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8246,6 +9068,10 @@ func (_m *EC2) DescribeSecurityGroupReferences(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DescribeSecurityGroupReferencesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSecurityGroupReferencesInput, ...func(*ec2.Options)) (*ec2.DescribeSecurityGroupReferencesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSecurityGroupReferencesInput, ...func(*ec2.Options)) *ec2.DescribeSecurityGroupReferencesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8254,7 +9080,6 @@ func (_m *EC2) DescribeSecurityGroupReferences(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSecurityGroupReferencesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8276,6 +9101,10 @@ func (_m *EC2) DescribeSecurityGroupRules(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeSecurityGroupRulesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSecurityGroupRulesInput, ...func(*ec2.Options)) (*ec2.DescribeSecurityGroupRulesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSecurityGroupRulesInput, ...func(*ec2.Options)) *ec2.DescribeSecurityGroupRulesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8284,7 +9113,6 @@ func (_m *EC2) DescribeSecurityGroupRules(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSecurityGroupRulesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8306,6 +9134,10 @@ func (_m *EC2) DescribeSecurityGroups(ctx context.Context, params *ec2.DescribeS ret := _m.Called(_ca...) var r0 *ec2.DescribeSecurityGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSecurityGroupsInput, ...func(*ec2.Options)) (*ec2.DescribeSecurityGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSecurityGroupsInput, ...func(*ec2.Options)) *ec2.DescribeSecurityGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8314,7 +9146,6 @@ func (_m *EC2) DescribeSecurityGroups(ctx context.Context, params *ec2.DescribeS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSecurityGroupsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8336,6 +9167,10 @@ func (_m *EC2) DescribeSnapshotAttribute(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeSnapshotAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSnapshotAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeSnapshotAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSnapshotAttributeInput, ...func(*ec2.Options)) *ec2.DescribeSnapshotAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8344,7 +9179,6 @@ func (_m *EC2) DescribeSnapshotAttribute(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSnapshotAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8366,6 +9200,10 @@ func (_m *EC2) DescribeSnapshotTierStatus(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeSnapshotTierStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSnapshotTierStatusInput, ...func(*ec2.Options)) (*ec2.DescribeSnapshotTierStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSnapshotTierStatusInput, ...func(*ec2.Options)) *ec2.DescribeSnapshotTierStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8374,7 +9212,6 @@ func (_m *EC2) DescribeSnapshotTierStatus(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSnapshotTierStatusInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8396,6 +9233,10 @@ func (_m *EC2) DescribeSnapshots(ctx context.Context, params *ec2.DescribeSnapsh ret := _m.Called(_ca...) var r0 *ec2.DescribeSnapshotsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSnapshotsInput, ...func(*ec2.Options)) (*ec2.DescribeSnapshotsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSnapshotsInput, ...func(*ec2.Options)) *ec2.DescribeSnapshotsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8404,7 +9245,6 @@ func (_m *EC2) DescribeSnapshots(ctx context.Context, params *ec2.DescribeSnapsh } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSnapshotsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8426,6 +9266,10 @@ func (_m *EC2) DescribeSpotDatafeedSubscription(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.DescribeSpotDatafeedSubscriptionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) (*ec2.DescribeSpotDatafeedSubscriptionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) *ec2.DescribeSpotDatafeedSubscriptionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8434,7 +9278,6 @@ func (_m *EC2) DescribeSpotDatafeedSubscription(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSpotDatafeedSubscriptionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8456,6 +9299,10 @@ func (_m *EC2) DescribeSpotFleetInstances(ctx context.Context, params *ec2.Descr ret := _m.Called(_ca...) var r0 *ec2.DescribeSpotFleetInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotFleetInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeSpotFleetInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotFleetInstancesInput, ...func(*ec2.Options)) *ec2.DescribeSpotFleetInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8464,7 +9311,6 @@ func (_m *EC2) DescribeSpotFleetInstances(ctx context.Context, params *ec2.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSpotFleetInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8486,6 +9332,10 @@ func (_m *EC2) DescribeSpotFleetRequestHistory(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DescribeSpotFleetRequestHistoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotFleetRequestHistoryInput, ...func(*ec2.Options)) (*ec2.DescribeSpotFleetRequestHistoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotFleetRequestHistoryInput, ...func(*ec2.Options)) *ec2.DescribeSpotFleetRequestHistoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8494,7 +9344,6 @@ func (_m *EC2) DescribeSpotFleetRequestHistory(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSpotFleetRequestHistoryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8516,6 +9365,10 @@ func (_m *EC2) DescribeSpotFleetRequests(ctx context.Context, params *ec2.Descri ret := _m.Called(_ca...) var r0 *ec2.DescribeSpotFleetRequestsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotFleetRequestsInput, ...func(*ec2.Options)) (*ec2.DescribeSpotFleetRequestsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotFleetRequestsInput, ...func(*ec2.Options)) *ec2.DescribeSpotFleetRequestsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8524,7 +9377,6 @@ func (_m *EC2) DescribeSpotFleetRequests(ctx context.Context, params *ec2.Descri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSpotFleetRequestsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8546,6 +9398,10 @@ func (_m *EC2) DescribeSpotInstanceRequests(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeSpotInstanceRequestsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotInstanceRequestsInput, ...func(*ec2.Options)) (*ec2.DescribeSpotInstanceRequestsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotInstanceRequestsInput, ...func(*ec2.Options)) *ec2.DescribeSpotInstanceRequestsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8554,7 +9410,6 @@ func (_m *EC2) DescribeSpotInstanceRequests(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSpotInstanceRequestsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8576,6 +9431,10 @@ func (_m *EC2) DescribeSpotPriceHistory(ctx context.Context, params *ec2.Describ ret := _m.Called(_ca...) var r0 *ec2.DescribeSpotPriceHistoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotPriceHistoryInput, ...func(*ec2.Options)) (*ec2.DescribeSpotPriceHistoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSpotPriceHistoryInput, ...func(*ec2.Options)) *ec2.DescribeSpotPriceHistoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8584,7 +9443,6 @@ func (_m *EC2) DescribeSpotPriceHistory(ctx context.Context, params *ec2.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSpotPriceHistoryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8606,6 +9464,10 @@ func (_m *EC2) DescribeStaleSecurityGroups(ctx context.Context, params *ec2.Desc ret := _m.Called(_ca...) var r0 *ec2.DescribeStaleSecurityGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeStaleSecurityGroupsInput, ...func(*ec2.Options)) (*ec2.DescribeStaleSecurityGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeStaleSecurityGroupsInput, ...func(*ec2.Options)) *ec2.DescribeStaleSecurityGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8614,7 +9476,6 @@ func (_m *EC2) DescribeStaleSecurityGroups(ctx context.Context, params *ec2.Desc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeStaleSecurityGroupsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8636,6 +9497,10 @@ func (_m *EC2) DescribeStoreImageTasks(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeStoreImageTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeStoreImageTasksInput, ...func(*ec2.Options)) (*ec2.DescribeStoreImageTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeStoreImageTasksInput, ...func(*ec2.Options)) *ec2.DescribeStoreImageTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8644,7 +9509,6 @@ func (_m *EC2) DescribeStoreImageTasks(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeStoreImageTasksInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8666,6 +9530,10 @@ func (_m *EC2) DescribeSubnets(ctx context.Context, params *ec2.DescribeSubnetsI ret := _m.Called(_ca...) var r0 *ec2.DescribeSubnetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSubnetsInput, ...func(*ec2.Options)) (*ec2.DescribeSubnetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeSubnetsInput, ...func(*ec2.Options)) *ec2.DescribeSubnetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8674,7 +9542,6 @@ func (_m *EC2) DescribeSubnets(ctx context.Context, params *ec2.DescribeSubnetsI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeSubnetsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8696,6 +9563,10 @@ func (_m *EC2) DescribeTags(ctx context.Context, params *ec2.DescribeTagsInput, ret := _m.Called(_ca...) var r0 *ec2.DescribeTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTagsInput, ...func(*ec2.Options)) (*ec2.DescribeTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTagsInput, ...func(*ec2.Options)) *ec2.DescribeTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8704,7 +9575,6 @@ func (_m *EC2) DescribeTags(ctx context.Context, params *ec2.DescribeTagsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTagsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8726,6 +9596,10 @@ func (_m *EC2) DescribeTrafficMirrorFilters(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeTrafficMirrorFiltersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrafficMirrorFiltersInput, ...func(*ec2.Options)) (*ec2.DescribeTrafficMirrorFiltersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrafficMirrorFiltersInput, ...func(*ec2.Options)) *ec2.DescribeTrafficMirrorFiltersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8734,7 +9608,6 @@ func (_m *EC2) DescribeTrafficMirrorFilters(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTrafficMirrorFiltersInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8756,6 +9629,10 @@ func (_m *EC2) DescribeTrafficMirrorSessions(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DescribeTrafficMirrorSessionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrafficMirrorSessionsInput, ...func(*ec2.Options)) (*ec2.DescribeTrafficMirrorSessionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrafficMirrorSessionsInput, ...func(*ec2.Options)) *ec2.DescribeTrafficMirrorSessionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8764,7 +9641,6 @@ func (_m *EC2) DescribeTrafficMirrorSessions(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTrafficMirrorSessionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8786,6 +9662,10 @@ func (_m *EC2) DescribeTrafficMirrorTargets(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeTrafficMirrorTargetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrafficMirrorTargetsInput, ...func(*ec2.Options)) (*ec2.DescribeTrafficMirrorTargetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrafficMirrorTargetsInput, ...func(*ec2.Options)) *ec2.DescribeTrafficMirrorTargetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8794,7 +9674,6 @@ func (_m *EC2) DescribeTrafficMirrorTargets(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTrafficMirrorTargetsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8816,6 +9695,10 @@ func (_m *EC2) DescribeTransitGatewayAttachments(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayAttachmentsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayAttachmentsInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayAttachmentsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayAttachmentsInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayAttachmentsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8824,7 +9707,6 @@ func (_m *EC2) DescribeTransitGatewayAttachments(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayAttachmentsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8846,6 +9728,10 @@ func (_m *EC2) DescribeTransitGatewayConnectPeers(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayConnectPeersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayConnectPeersInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayConnectPeersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayConnectPeersInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayConnectPeersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8854,7 +9740,6 @@ func (_m *EC2) DescribeTransitGatewayConnectPeers(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayConnectPeersInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8876,6 +9761,10 @@ func (_m *EC2) DescribeTransitGatewayConnects(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayConnectsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayConnectsInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayConnectsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayConnectsInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayConnectsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8884,7 +9773,6 @@ func (_m *EC2) DescribeTransitGatewayConnects(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayConnectsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8906,6 +9794,10 @@ func (_m *EC2) DescribeTransitGatewayMulticastDomains(ctx context.Context, param ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayMulticastDomainsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayMulticastDomainsInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayMulticastDomainsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayMulticastDomainsInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayMulticastDomainsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8914,7 +9806,6 @@ func (_m *EC2) DescribeTransitGatewayMulticastDomains(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayMulticastDomainsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8936,6 +9827,10 @@ func (_m *EC2) DescribeTransitGatewayPeeringAttachments(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayPeeringAttachmentsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayPeeringAttachmentsInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayPeeringAttachmentsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayPeeringAttachmentsInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayPeeringAttachmentsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8944,7 +9839,6 @@ func (_m *EC2) DescribeTransitGatewayPeeringAttachments(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayPeeringAttachmentsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8966,6 +9860,10 @@ func (_m *EC2) DescribeTransitGatewayRouteTables(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayRouteTablesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayRouteTablesInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayRouteTablesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayRouteTablesInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayRouteTablesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -8974,7 +9872,6 @@ func (_m *EC2) DescribeTransitGatewayRouteTables(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayRouteTablesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -8996,6 +9893,10 @@ func (_m *EC2) DescribeTransitGatewayVpcAttachments(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewayVpcAttachmentsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayVpcAttachmentsInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayVpcAttachmentsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewayVpcAttachmentsInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewayVpcAttachmentsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9004,7 +9905,6 @@ func (_m *EC2) DescribeTransitGatewayVpcAttachments(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewayVpcAttachmentsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9026,6 +9926,10 @@ func (_m *EC2) DescribeTransitGateways(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeTransitGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeTransitGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTransitGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeTransitGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9034,7 +9938,6 @@ func (_m *EC2) DescribeTransitGateways(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTransitGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9056,6 +9959,10 @@ func (_m *EC2) DescribeTrunkInterfaceAssociations(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.DescribeTrunkInterfaceAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrunkInterfaceAssociationsInput, ...func(*ec2.Options)) (*ec2.DescribeTrunkInterfaceAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeTrunkInterfaceAssociationsInput, ...func(*ec2.Options)) *ec2.DescribeTrunkInterfaceAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9064,7 +9971,6 @@ func (_m *EC2) DescribeTrunkInterfaceAssociations(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeTrunkInterfaceAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9086,6 +9992,10 @@ func (_m *EC2) DescribeVolumeAttribute(ctx context.Context, params *ec2.Describe ret := _m.Called(_ca...) var r0 *ec2.DescribeVolumeAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumeAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeVolumeAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumeAttributeInput, ...func(*ec2.Options)) *ec2.DescribeVolumeAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9094,7 +10004,6 @@ func (_m *EC2) DescribeVolumeAttribute(ctx context.Context, params *ec2.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVolumeAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9116,6 +10025,10 @@ func (_m *EC2) DescribeVolumeStatus(ctx context.Context, params *ec2.DescribeVol ret := _m.Called(_ca...) var r0 *ec2.DescribeVolumeStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumeStatusInput, ...func(*ec2.Options)) (*ec2.DescribeVolumeStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumeStatusInput, ...func(*ec2.Options)) *ec2.DescribeVolumeStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9124,7 +10037,6 @@ func (_m *EC2) DescribeVolumeStatus(ctx context.Context, params *ec2.DescribeVol } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVolumeStatusInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9146,6 +10058,10 @@ func (_m *EC2) DescribeVolumes(ctx context.Context, params *ec2.DescribeVolumesI ret := _m.Called(_ca...) var r0 *ec2.DescribeVolumesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumesInput, ...func(*ec2.Options)) (*ec2.DescribeVolumesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumesInput, ...func(*ec2.Options)) *ec2.DescribeVolumesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9154,7 +10070,6 @@ func (_m *EC2) DescribeVolumes(ctx context.Context, params *ec2.DescribeVolumesI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVolumesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9176,6 +10091,10 @@ func (_m *EC2) DescribeVolumesModifications(ctx context.Context, params *ec2.Des ret := _m.Called(_ca...) var r0 *ec2.DescribeVolumesModificationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumesModificationsInput, ...func(*ec2.Options)) (*ec2.DescribeVolumesModificationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVolumesModificationsInput, ...func(*ec2.Options)) *ec2.DescribeVolumesModificationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9184,7 +10103,6 @@ func (_m *EC2) DescribeVolumesModifications(ctx context.Context, params *ec2.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVolumesModificationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9206,6 +10124,10 @@ func (_m *EC2) DescribeVpcAttribute(ctx context.Context, params *ec2.DescribeVpc ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcAttributeInput, ...func(*ec2.Options)) (*ec2.DescribeVpcAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcAttributeInput, ...func(*ec2.Options)) *ec2.DescribeVpcAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9214,7 +10136,6 @@ func (_m *EC2) DescribeVpcAttribute(ctx context.Context, params *ec2.DescribeVpc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9236,6 +10157,10 @@ func (_m *EC2) DescribeVpcClassicLink(ctx context.Context, params *ec2.DescribeV ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcClassicLinkOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcClassicLinkInput, ...func(*ec2.Options)) (*ec2.DescribeVpcClassicLinkOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcClassicLinkInput, ...func(*ec2.Options)) *ec2.DescribeVpcClassicLinkOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9244,7 +10169,6 @@ func (_m *EC2) DescribeVpcClassicLink(ctx context.Context, params *ec2.DescribeV } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcClassicLinkInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9266,6 +10190,10 @@ func (_m *EC2) DescribeVpcClassicLinkDnsSupport(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcClassicLinkDnsSupportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) (*ec2.DescribeVpcClassicLinkDnsSupportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) *ec2.DescribeVpcClassicLinkDnsSupportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9274,7 +10202,6 @@ func (_m *EC2) DescribeVpcClassicLinkDnsSupport(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9296,6 +10223,10 @@ func (_m *EC2) DescribeVpcEndpointConnectionNotifications(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcEndpointConnectionNotificationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointConnectionNotificationsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcEndpointConnectionNotificationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointConnectionNotificationsInput, ...func(*ec2.Options)) *ec2.DescribeVpcEndpointConnectionNotificationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9304,7 +10235,6 @@ func (_m *EC2) DescribeVpcEndpointConnectionNotifications(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcEndpointConnectionNotificationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9326,6 +10256,10 @@ func (_m *EC2) DescribeVpcEndpointConnections(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcEndpointConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointConnectionsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcEndpointConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointConnectionsInput, ...func(*ec2.Options)) *ec2.DescribeVpcEndpointConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9334,7 +10268,6 @@ func (_m *EC2) DescribeVpcEndpointConnections(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcEndpointConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9356,6 +10289,10 @@ func (_m *EC2) DescribeVpcEndpointServiceConfigurations(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcEndpointServiceConfigurationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointServiceConfigurationsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcEndpointServiceConfigurationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointServiceConfigurationsInput, ...func(*ec2.Options)) *ec2.DescribeVpcEndpointServiceConfigurationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9364,7 +10301,6 @@ func (_m *EC2) DescribeVpcEndpointServiceConfigurations(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcEndpointServiceConfigurationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9386,6 +10322,10 @@ func (_m *EC2) DescribeVpcEndpointServicePermissions(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcEndpointServicePermissionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointServicePermissionsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcEndpointServicePermissionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointServicePermissionsInput, ...func(*ec2.Options)) *ec2.DescribeVpcEndpointServicePermissionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9394,7 +10334,6 @@ func (_m *EC2) DescribeVpcEndpointServicePermissions(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcEndpointServicePermissionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9416,6 +10355,10 @@ func (_m *EC2) DescribeVpcEndpointServices(ctx context.Context, params *ec2.Desc ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcEndpointServicesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointServicesInput, ...func(*ec2.Options)) (*ec2.DescribeVpcEndpointServicesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointServicesInput, ...func(*ec2.Options)) *ec2.DescribeVpcEndpointServicesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9424,7 +10367,6 @@ func (_m *EC2) DescribeVpcEndpointServices(ctx context.Context, params *ec2.Desc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcEndpointServicesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9446,6 +10388,10 @@ func (_m *EC2) DescribeVpcEndpoints(ctx context.Context, params *ec2.DescribeVpc ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcEndpointsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcEndpointsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcEndpointsInput, ...func(*ec2.Options)) *ec2.DescribeVpcEndpointsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9454,7 +10400,6 @@ func (_m *EC2) DescribeVpcEndpoints(ctx context.Context, params *ec2.DescribeVpc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcEndpointsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9476,6 +10421,10 @@ func (_m *EC2) DescribeVpcPeeringConnections(ctx context.Context, params *ec2.De ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcPeeringConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcPeeringConnectionsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcPeeringConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcPeeringConnectionsInput, ...func(*ec2.Options)) *ec2.DescribeVpcPeeringConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9484,7 +10433,6 @@ func (_m *EC2) DescribeVpcPeeringConnections(ctx context.Context, params *ec2.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcPeeringConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9506,6 +10454,10 @@ func (_m *EC2) DescribeVpcs(ctx context.Context, params *ec2.DescribeVpcsInput, ret := _m.Called(_ca...) var r0 *ec2.DescribeVpcsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcsInput, ...func(*ec2.Options)) (*ec2.DescribeVpcsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpcsInput, ...func(*ec2.Options)) *ec2.DescribeVpcsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9514,7 +10466,6 @@ func (_m *EC2) DescribeVpcs(ctx context.Context, params *ec2.DescribeVpcsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpcsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9536,6 +10487,10 @@ func (_m *EC2) DescribeVpnConnections(ctx context.Context, params *ec2.DescribeV ret := _m.Called(_ca...) var r0 *ec2.DescribeVpnConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpnConnectionsInput, ...func(*ec2.Options)) (*ec2.DescribeVpnConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpnConnectionsInput, ...func(*ec2.Options)) *ec2.DescribeVpnConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9544,7 +10499,6 @@ func (_m *EC2) DescribeVpnConnections(ctx context.Context, params *ec2.DescribeV } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpnConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9566,6 +10520,10 @@ func (_m *EC2) DescribeVpnGateways(ctx context.Context, params *ec2.DescribeVpnG ret := _m.Called(_ca...) var r0 *ec2.DescribeVpnGatewaysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpnGatewaysInput, ...func(*ec2.Options)) (*ec2.DescribeVpnGatewaysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DescribeVpnGatewaysInput, ...func(*ec2.Options)) *ec2.DescribeVpnGatewaysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9574,7 +10532,6 @@ func (_m *EC2) DescribeVpnGateways(ctx context.Context, params *ec2.DescribeVpnG } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DescribeVpnGatewaysInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9596,6 +10553,10 @@ func (_m *EC2) DetachClassicLinkVpc(ctx context.Context, params *ec2.DetachClass ret := _m.Called(_ca...) var r0 *ec2.DetachClassicLinkVpcOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachClassicLinkVpcInput, ...func(*ec2.Options)) (*ec2.DetachClassicLinkVpcOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachClassicLinkVpcInput, ...func(*ec2.Options)) *ec2.DetachClassicLinkVpcOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9604,7 +10565,6 @@ func (_m *EC2) DetachClassicLinkVpc(ctx context.Context, params *ec2.DetachClass } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DetachClassicLinkVpcInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9626,6 +10586,10 @@ func (_m *EC2) DetachInternetGateway(ctx context.Context, params *ec2.DetachInte ret := _m.Called(_ca...) var r0 *ec2.DetachInternetGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachInternetGatewayInput, ...func(*ec2.Options)) (*ec2.DetachInternetGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachInternetGatewayInput, ...func(*ec2.Options)) *ec2.DetachInternetGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9634,7 +10598,6 @@ func (_m *EC2) DetachInternetGateway(ctx context.Context, params *ec2.DetachInte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DetachInternetGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9656,6 +10619,10 @@ func (_m *EC2) DetachNetworkInterface(ctx context.Context, params *ec2.DetachNet ret := _m.Called(_ca...) var r0 *ec2.DetachNetworkInterfaceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachNetworkInterfaceInput, ...func(*ec2.Options)) (*ec2.DetachNetworkInterfaceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachNetworkInterfaceInput, ...func(*ec2.Options)) *ec2.DetachNetworkInterfaceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9664,7 +10631,6 @@ func (_m *EC2) DetachNetworkInterface(ctx context.Context, params *ec2.DetachNet } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DetachNetworkInterfaceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9686,6 +10652,10 @@ func (_m *EC2) DetachVolume(ctx context.Context, params *ec2.DetachVolumeInput, ret := _m.Called(_ca...) var r0 *ec2.DetachVolumeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachVolumeInput, ...func(*ec2.Options)) (*ec2.DetachVolumeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachVolumeInput, ...func(*ec2.Options)) *ec2.DetachVolumeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9694,7 +10664,6 @@ func (_m *EC2) DetachVolume(ctx context.Context, params *ec2.DetachVolumeInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DetachVolumeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9716,6 +10685,10 @@ func (_m *EC2) DetachVpnGateway(ctx context.Context, params *ec2.DetachVpnGatewa ret := _m.Called(_ca...) var r0 *ec2.DetachVpnGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachVpnGatewayInput, ...func(*ec2.Options)) (*ec2.DetachVpnGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DetachVpnGatewayInput, ...func(*ec2.Options)) *ec2.DetachVpnGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9724,7 +10697,6 @@ func (_m *EC2) DetachVpnGateway(ctx context.Context, params *ec2.DetachVpnGatewa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DetachVpnGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9746,6 +10718,10 @@ func (_m *EC2) DisableEbsEncryptionByDefault(ctx context.Context, params *ec2.Di ret := _m.Called(_ca...) var r0 *ec2.DisableEbsEncryptionByDefaultOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableEbsEncryptionByDefaultInput, ...func(*ec2.Options)) (*ec2.DisableEbsEncryptionByDefaultOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableEbsEncryptionByDefaultInput, ...func(*ec2.Options)) *ec2.DisableEbsEncryptionByDefaultOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9754,7 +10730,6 @@ func (_m *EC2) DisableEbsEncryptionByDefault(ctx context.Context, params *ec2.Di } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableEbsEncryptionByDefaultInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9776,6 +10751,10 @@ func (_m *EC2) DisableFastLaunch(ctx context.Context, params *ec2.DisableFastLau ret := _m.Called(_ca...) var r0 *ec2.DisableFastLaunchOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableFastLaunchInput, ...func(*ec2.Options)) (*ec2.DisableFastLaunchOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableFastLaunchInput, ...func(*ec2.Options)) *ec2.DisableFastLaunchOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9784,7 +10763,6 @@ func (_m *EC2) DisableFastLaunch(ctx context.Context, params *ec2.DisableFastLau } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableFastLaunchInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9806,6 +10784,10 @@ func (_m *EC2) DisableFastSnapshotRestores(ctx context.Context, params *ec2.Disa ret := _m.Called(_ca...) var r0 *ec2.DisableFastSnapshotRestoresOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableFastSnapshotRestoresInput, ...func(*ec2.Options)) (*ec2.DisableFastSnapshotRestoresOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableFastSnapshotRestoresInput, ...func(*ec2.Options)) *ec2.DisableFastSnapshotRestoresOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9814,7 +10796,6 @@ func (_m *EC2) DisableFastSnapshotRestores(ctx context.Context, params *ec2.Disa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableFastSnapshotRestoresInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9836,6 +10817,10 @@ func (_m *EC2) DisableImageDeprecation(ctx context.Context, params *ec2.DisableI ret := _m.Called(_ca...) var r0 *ec2.DisableImageDeprecationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableImageDeprecationInput, ...func(*ec2.Options)) (*ec2.DisableImageDeprecationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableImageDeprecationInput, ...func(*ec2.Options)) *ec2.DisableImageDeprecationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9844,7 +10829,6 @@ func (_m *EC2) DisableImageDeprecation(ctx context.Context, params *ec2.DisableI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableImageDeprecationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9866,6 +10850,10 @@ func (_m *EC2) DisableIpamOrganizationAdminAccount(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.DisableIpamOrganizationAdminAccountOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableIpamOrganizationAdminAccountInput, ...func(*ec2.Options)) (*ec2.DisableIpamOrganizationAdminAccountOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableIpamOrganizationAdminAccountInput, ...func(*ec2.Options)) *ec2.DisableIpamOrganizationAdminAccountOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9874,7 +10862,6 @@ func (_m *EC2) DisableIpamOrganizationAdminAccount(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableIpamOrganizationAdminAccountInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9896,6 +10883,10 @@ func (_m *EC2) DisableSerialConsoleAccess(ctx context.Context, params *ec2.Disab ret := _m.Called(_ca...) var r0 *ec2.DisableSerialConsoleAccessOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableSerialConsoleAccessInput, ...func(*ec2.Options)) (*ec2.DisableSerialConsoleAccessOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableSerialConsoleAccessInput, ...func(*ec2.Options)) *ec2.DisableSerialConsoleAccessOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9904,7 +10895,6 @@ func (_m *EC2) DisableSerialConsoleAccess(ctx context.Context, params *ec2.Disab } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableSerialConsoleAccessInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9926,6 +10916,10 @@ func (_m *EC2) DisableTransitGatewayRouteTablePropagation(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.DisableTransitGatewayRouteTablePropagationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableTransitGatewayRouteTablePropagationInput, ...func(*ec2.Options)) (*ec2.DisableTransitGatewayRouteTablePropagationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableTransitGatewayRouteTablePropagationInput, ...func(*ec2.Options)) *ec2.DisableTransitGatewayRouteTablePropagationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9934,7 +10928,6 @@ func (_m *EC2) DisableTransitGatewayRouteTablePropagation(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableTransitGatewayRouteTablePropagationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9956,6 +10949,10 @@ func (_m *EC2) DisableVgwRoutePropagation(ctx context.Context, params *ec2.Disab ret := _m.Called(_ca...) var r0 *ec2.DisableVgwRoutePropagationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableVgwRoutePropagationInput, ...func(*ec2.Options)) (*ec2.DisableVgwRoutePropagationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableVgwRoutePropagationInput, ...func(*ec2.Options)) *ec2.DisableVgwRoutePropagationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9964,7 +10961,6 @@ func (_m *EC2) DisableVgwRoutePropagation(ctx context.Context, params *ec2.Disab } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableVgwRoutePropagationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -9986,6 +10982,10 @@ func (_m *EC2) DisableVpcClassicLink(ctx context.Context, params *ec2.DisableVpc ret := _m.Called(_ca...) var r0 *ec2.DisableVpcClassicLinkOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableVpcClassicLinkInput, ...func(*ec2.Options)) (*ec2.DisableVpcClassicLinkOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableVpcClassicLinkInput, ...func(*ec2.Options)) *ec2.DisableVpcClassicLinkOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -9994,7 +10994,6 @@ func (_m *EC2) DisableVpcClassicLink(ctx context.Context, params *ec2.DisableVpc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableVpcClassicLinkInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10016,6 +11015,10 @@ func (_m *EC2) DisableVpcClassicLinkDnsSupport(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DisableVpcClassicLinkDnsSupportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) (*ec2.DisableVpcClassicLinkDnsSupportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisableVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) *ec2.DisableVpcClassicLinkDnsSupportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10024,7 +11027,6 @@ func (_m *EC2) DisableVpcClassicLinkDnsSupport(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisableVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10046,6 +11048,10 @@ func (_m *EC2) DisassociateAddress(ctx context.Context, params *ec2.Disassociate ret := _m.Called(_ca...) var r0 *ec2.DisassociateAddressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateAddressInput, ...func(*ec2.Options)) (*ec2.DisassociateAddressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateAddressInput, ...func(*ec2.Options)) *ec2.DisassociateAddressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10054,7 +11060,6 @@ func (_m *EC2) DisassociateAddress(ctx context.Context, params *ec2.Disassociate } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateAddressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10076,6 +11081,10 @@ func (_m *EC2) DisassociateClientVpnTargetNetwork(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.DisassociateClientVpnTargetNetworkOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateClientVpnTargetNetworkInput, ...func(*ec2.Options)) (*ec2.DisassociateClientVpnTargetNetworkOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateClientVpnTargetNetworkInput, ...func(*ec2.Options)) *ec2.DisassociateClientVpnTargetNetworkOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10084,7 +11093,6 @@ func (_m *EC2) DisassociateClientVpnTargetNetwork(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateClientVpnTargetNetworkInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10106,6 +11114,10 @@ func (_m *EC2) DisassociateEnclaveCertificateIamRole(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DisassociateEnclaveCertificateIamRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateEnclaveCertificateIamRoleInput, ...func(*ec2.Options)) (*ec2.DisassociateEnclaveCertificateIamRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateEnclaveCertificateIamRoleInput, ...func(*ec2.Options)) *ec2.DisassociateEnclaveCertificateIamRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10114,7 +11126,6 @@ func (_m *EC2) DisassociateEnclaveCertificateIamRole(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateEnclaveCertificateIamRoleInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10136,6 +11147,10 @@ func (_m *EC2) DisassociateIamInstanceProfile(ctx context.Context, params *ec2.D ret := _m.Called(_ca...) var r0 *ec2.DisassociateIamInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateIamInstanceProfileInput, ...func(*ec2.Options)) (*ec2.DisassociateIamInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateIamInstanceProfileInput, ...func(*ec2.Options)) *ec2.DisassociateIamInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10144,7 +11159,6 @@ func (_m *EC2) DisassociateIamInstanceProfile(ctx context.Context, params *ec2.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateIamInstanceProfileInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10166,6 +11180,10 @@ func (_m *EC2) DisassociateInstanceEventWindow(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.DisassociateInstanceEventWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateInstanceEventWindowInput, ...func(*ec2.Options)) (*ec2.DisassociateInstanceEventWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateInstanceEventWindowInput, ...func(*ec2.Options)) *ec2.DisassociateInstanceEventWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10174,7 +11192,6 @@ func (_m *EC2) DisassociateInstanceEventWindow(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateInstanceEventWindowInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10196,6 +11213,10 @@ func (_m *EC2) DisassociateRouteTable(ctx context.Context, params *ec2.Disassoci ret := _m.Called(_ca...) var r0 *ec2.DisassociateRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateRouteTableInput, ...func(*ec2.Options)) (*ec2.DisassociateRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateRouteTableInput, ...func(*ec2.Options)) *ec2.DisassociateRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10204,7 +11225,6 @@ func (_m *EC2) DisassociateRouteTable(ctx context.Context, params *ec2.Disassoci } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10226,6 +11246,10 @@ func (_m *EC2) DisassociateSubnetCidrBlock(ctx context.Context, params *ec2.Disa ret := _m.Called(_ca...) var r0 *ec2.DisassociateSubnetCidrBlockOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateSubnetCidrBlockInput, ...func(*ec2.Options)) (*ec2.DisassociateSubnetCidrBlockOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateSubnetCidrBlockInput, ...func(*ec2.Options)) *ec2.DisassociateSubnetCidrBlockOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10234,7 +11258,6 @@ func (_m *EC2) DisassociateSubnetCidrBlock(ctx context.Context, params *ec2.Disa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateSubnetCidrBlockInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10256,6 +11279,10 @@ func (_m *EC2) DisassociateTransitGatewayMulticastDomain(ctx context.Context, pa ret := _m.Called(_ca...) var r0 *ec2.DisassociateTransitGatewayMulticastDomainOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) (*ec2.DisassociateTransitGatewayMulticastDomainOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) *ec2.DisassociateTransitGatewayMulticastDomainOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10264,7 +11291,6 @@ func (_m *EC2) DisassociateTransitGatewayMulticastDomain(ctx context.Context, pa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateTransitGatewayMulticastDomainInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10286,6 +11312,10 @@ func (_m *EC2) DisassociateTransitGatewayRouteTable(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.DisassociateTransitGatewayRouteTableOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateTransitGatewayRouteTableInput, ...func(*ec2.Options)) (*ec2.DisassociateTransitGatewayRouteTableOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateTransitGatewayRouteTableInput, ...func(*ec2.Options)) *ec2.DisassociateTransitGatewayRouteTableOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10294,7 +11324,6 @@ func (_m *EC2) DisassociateTransitGatewayRouteTable(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateTransitGatewayRouteTableInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10316,6 +11345,10 @@ func (_m *EC2) DisassociateTrunkInterface(ctx context.Context, params *ec2.Disas ret := _m.Called(_ca...) var r0 *ec2.DisassociateTrunkInterfaceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateTrunkInterfaceInput, ...func(*ec2.Options)) (*ec2.DisassociateTrunkInterfaceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateTrunkInterfaceInput, ...func(*ec2.Options)) *ec2.DisassociateTrunkInterfaceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10324,7 +11357,6 @@ func (_m *EC2) DisassociateTrunkInterface(ctx context.Context, params *ec2.Disas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateTrunkInterfaceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10346,6 +11378,10 @@ func (_m *EC2) DisassociateVpcCidrBlock(ctx context.Context, params *ec2.Disasso ret := _m.Called(_ca...) var r0 *ec2.DisassociateVpcCidrBlockOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateVpcCidrBlockInput, ...func(*ec2.Options)) (*ec2.DisassociateVpcCidrBlockOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.DisassociateVpcCidrBlockInput, ...func(*ec2.Options)) *ec2.DisassociateVpcCidrBlockOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10354,7 +11390,6 @@ func (_m *EC2) DisassociateVpcCidrBlock(ctx context.Context, params *ec2.Disasso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.DisassociateVpcCidrBlockInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10376,6 +11411,10 @@ func (_m *EC2) EnableEbsEncryptionByDefault(ctx context.Context, params *ec2.Ena ret := _m.Called(_ca...) var r0 *ec2.EnableEbsEncryptionByDefaultOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableEbsEncryptionByDefaultInput, ...func(*ec2.Options)) (*ec2.EnableEbsEncryptionByDefaultOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableEbsEncryptionByDefaultInput, ...func(*ec2.Options)) *ec2.EnableEbsEncryptionByDefaultOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10384,7 +11423,6 @@ func (_m *EC2) EnableEbsEncryptionByDefault(ctx context.Context, params *ec2.Ena } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableEbsEncryptionByDefaultInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10406,6 +11444,10 @@ func (_m *EC2) EnableFastLaunch(ctx context.Context, params *ec2.EnableFastLaunc ret := _m.Called(_ca...) var r0 *ec2.EnableFastLaunchOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableFastLaunchInput, ...func(*ec2.Options)) (*ec2.EnableFastLaunchOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableFastLaunchInput, ...func(*ec2.Options)) *ec2.EnableFastLaunchOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10414,7 +11456,6 @@ func (_m *EC2) EnableFastLaunch(ctx context.Context, params *ec2.EnableFastLaunc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableFastLaunchInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10436,6 +11477,10 @@ func (_m *EC2) EnableFastSnapshotRestores(ctx context.Context, params *ec2.Enabl ret := _m.Called(_ca...) var r0 *ec2.EnableFastSnapshotRestoresOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableFastSnapshotRestoresInput, ...func(*ec2.Options)) (*ec2.EnableFastSnapshotRestoresOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableFastSnapshotRestoresInput, ...func(*ec2.Options)) *ec2.EnableFastSnapshotRestoresOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10444,7 +11489,6 @@ func (_m *EC2) EnableFastSnapshotRestores(ctx context.Context, params *ec2.Enabl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableFastSnapshotRestoresInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10466,6 +11510,10 @@ func (_m *EC2) EnableImageDeprecation(ctx context.Context, params *ec2.EnableIma ret := _m.Called(_ca...) var r0 *ec2.EnableImageDeprecationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableImageDeprecationInput, ...func(*ec2.Options)) (*ec2.EnableImageDeprecationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableImageDeprecationInput, ...func(*ec2.Options)) *ec2.EnableImageDeprecationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10474,7 +11522,6 @@ func (_m *EC2) EnableImageDeprecation(ctx context.Context, params *ec2.EnableIma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableImageDeprecationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10496,6 +11543,10 @@ func (_m *EC2) EnableIpamOrganizationAdminAccount(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.EnableIpamOrganizationAdminAccountOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableIpamOrganizationAdminAccountInput, ...func(*ec2.Options)) (*ec2.EnableIpamOrganizationAdminAccountOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableIpamOrganizationAdminAccountInput, ...func(*ec2.Options)) *ec2.EnableIpamOrganizationAdminAccountOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10504,7 +11555,6 @@ func (_m *EC2) EnableIpamOrganizationAdminAccount(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableIpamOrganizationAdminAccountInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10526,6 +11576,10 @@ func (_m *EC2) EnableSerialConsoleAccess(ctx context.Context, params *ec2.Enable ret := _m.Called(_ca...) var r0 *ec2.EnableSerialConsoleAccessOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableSerialConsoleAccessInput, ...func(*ec2.Options)) (*ec2.EnableSerialConsoleAccessOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableSerialConsoleAccessInput, ...func(*ec2.Options)) *ec2.EnableSerialConsoleAccessOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10534,7 +11588,6 @@ func (_m *EC2) EnableSerialConsoleAccess(ctx context.Context, params *ec2.Enable } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableSerialConsoleAccessInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10556,6 +11609,10 @@ func (_m *EC2) EnableTransitGatewayRouteTablePropagation(ctx context.Context, pa ret := _m.Called(_ca...) var r0 *ec2.EnableTransitGatewayRouteTablePropagationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableTransitGatewayRouteTablePropagationInput, ...func(*ec2.Options)) (*ec2.EnableTransitGatewayRouteTablePropagationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableTransitGatewayRouteTablePropagationInput, ...func(*ec2.Options)) *ec2.EnableTransitGatewayRouteTablePropagationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10564,7 +11621,6 @@ func (_m *EC2) EnableTransitGatewayRouteTablePropagation(ctx context.Context, pa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableTransitGatewayRouteTablePropagationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10586,6 +11642,10 @@ func (_m *EC2) EnableVgwRoutePropagation(ctx context.Context, params *ec2.Enable ret := _m.Called(_ca...) var r0 *ec2.EnableVgwRoutePropagationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVgwRoutePropagationInput, ...func(*ec2.Options)) (*ec2.EnableVgwRoutePropagationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVgwRoutePropagationInput, ...func(*ec2.Options)) *ec2.EnableVgwRoutePropagationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10594,7 +11654,6 @@ func (_m *EC2) EnableVgwRoutePropagation(ctx context.Context, params *ec2.Enable } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableVgwRoutePropagationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10616,6 +11675,10 @@ func (_m *EC2) EnableVolumeIO(ctx context.Context, params *ec2.EnableVolumeIOInp ret := _m.Called(_ca...) var r0 *ec2.EnableVolumeIOOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVolumeIOInput, ...func(*ec2.Options)) (*ec2.EnableVolumeIOOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVolumeIOInput, ...func(*ec2.Options)) *ec2.EnableVolumeIOOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10624,7 +11687,6 @@ func (_m *EC2) EnableVolumeIO(ctx context.Context, params *ec2.EnableVolumeIOInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableVolumeIOInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10646,6 +11708,10 @@ func (_m *EC2) EnableVpcClassicLink(ctx context.Context, params *ec2.EnableVpcCl ret := _m.Called(_ca...) var r0 *ec2.EnableVpcClassicLinkOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVpcClassicLinkInput, ...func(*ec2.Options)) (*ec2.EnableVpcClassicLinkOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVpcClassicLinkInput, ...func(*ec2.Options)) *ec2.EnableVpcClassicLinkOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10654,7 +11720,6 @@ func (_m *EC2) EnableVpcClassicLink(ctx context.Context, params *ec2.EnableVpcCl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableVpcClassicLinkInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10676,6 +11741,10 @@ func (_m *EC2) EnableVpcClassicLinkDnsSupport(ctx context.Context, params *ec2.E ret := _m.Called(_ca...) var r0 *ec2.EnableVpcClassicLinkDnsSupportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) (*ec2.EnableVpcClassicLinkDnsSupportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.EnableVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) *ec2.EnableVpcClassicLinkDnsSupportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10684,7 +11753,6 @@ func (_m *EC2) EnableVpcClassicLinkDnsSupport(ctx context.Context, params *ec2.E } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.EnableVpcClassicLinkDnsSupportInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10706,6 +11774,10 @@ func (_m *EC2) ExportClientVpnClientCertificateRevocationList(ctx context.Contex ret := _m.Called(_ca...) var r0 *ec2.ExportClientVpnClientCertificateRevocationListOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportClientVpnClientCertificateRevocationListInput, ...func(*ec2.Options)) (*ec2.ExportClientVpnClientCertificateRevocationListOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportClientVpnClientCertificateRevocationListInput, ...func(*ec2.Options)) *ec2.ExportClientVpnClientCertificateRevocationListOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10714,7 +11786,6 @@ func (_m *EC2) ExportClientVpnClientCertificateRevocationList(ctx context.Contex } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ExportClientVpnClientCertificateRevocationListInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10736,6 +11807,10 @@ func (_m *EC2) ExportClientVpnClientConfiguration(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *ec2.ExportClientVpnClientConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportClientVpnClientConfigurationInput, ...func(*ec2.Options)) (*ec2.ExportClientVpnClientConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportClientVpnClientConfigurationInput, ...func(*ec2.Options)) *ec2.ExportClientVpnClientConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10744,7 +11819,6 @@ func (_m *EC2) ExportClientVpnClientConfiguration(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ExportClientVpnClientConfigurationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10766,6 +11840,10 @@ func (_m *EC2) ExportImage(ctx context.Context, params *ec2.ExportImageInput, op ret := _m.Called(_ca...) var r0 *ec2.ExportImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportImageInput, ...func(*ec2.Options)) (*ec2.ExportImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportImageInput, ...func(*ec2.Options)) *ec2.ExportImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10774,7 +11852,6 @@ func (_m *EC2) ExportImage(ctx context.Context, params *ec2.ExportImageInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ExportImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10796,6 +11873,10 @@ func (_m *EC2) ExportTransitGatewayRoutes(ctx context.Context, params *ec2.Expor ret := _m.Called(_ca...) var r0 *ec2.ExportTransitGatewayRoutesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportTransitGatewayRoutesInput, ...func(*ec2.Options)) (*ec2.ExportTransitGatewayRoutesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ExportTransitGatewayRoutesInput, ...func(*ec2.Options)) *ec2.ExportTransitGatewayRoutesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10804,7 +11885,6 @@ func (_m *EC2) ExportTransitGatewayRoutes(ctx context.Context, params *ec2.Expor } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ExportTransitGatewayRoutesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10826,6 +11906,10 @@ func (_m *EC2) GetAssociatedEnclaveCertificateIamRoles(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.GetAssociatedEnclaveCertificateIamRolesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetAssociatedEnclaveCertificateIamRolesInput, ...func(*ec2.Options)) (*ec2.GetAssociatedEnclaveCertificateIamRolesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetAssociatedEnclaveCertificateIamRolesInput, ...func(*ec2.Options)) *ec2.GetAssociatedEnclaveCertificateIamRolesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10834,7 +11918,6 @@ func (_m *EC2) GetAssociatedEnclaveCertificateIamRoles(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetAssociatedEnclaveCertificateIamRolesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10856,6 +11939,10 @@ func (_m *EC2) GetAssociatedIpv6PoolCidrs(ctx context.Context, params *ec2.GetAs ret := _m.Called(_ca...) var r0 *ec2.GetAssociatedIpv6PoolCidrsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetAssociatedIpv6PoolCidrsInput, ...func(*ec2.Options)) (*ec2.GetAssociatedIpv6PoolCidrsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetAssociatedIpv6PoolCidrsInput, ...func(*ec2.Options)) *ec2.GetAssociatedIpv6PoolCidrsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10864,7 +11951,6 @@ func (_m *EC2) GetAssociatedIpv6PoolCidrs(ctx context.Context, params *ec2.GetAs } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetAssociatedIpv6PoolCidrsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10886,6 +11972,10 @@ func (_m *EC2) GetCapacityReservationUsage(ctx context.Context, params *ec2.GetC ret := _m.Called(_ca...) var r0 *ec2.GetCapacityReservationUsageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetCapacityReservationUsageInput, ...func(*ec2.Options)) (*ec2.GetCapacityReservationUsageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetCapacityReservationUsageInput, ...func(*ec2.Options)) *ec2.GetCapacityReservationUsageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10894,7 +11984,6 @@ func (_m *EC2) GetCapacityReservationUsage(ctx context.Context, params *ec2.GetC } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetCapacityReservationUsageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10916,6 +12005,10 @@ func (_m *EC2) GetCoipPoolUsage(ctx context.Context, params *ec2.GetCoipPoolUsag ret := _m.Called(_ca...) var r0 *ec2.GetCoipPoolUsageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetCoipPoolUsageInput, ...func(*ec2.Options)) (*ec2.GetCoipPoolUsageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetCoipPoolUsageInput, ...func(*ec2.Options)) *ec2.GetCoipPoolUsageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10924,7 +12017,6 @@ func (_m *EC2) GetCoipPoolUsage(ctx context.Context, params *ec2.GetCoipPoolUsag } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetCoipPoolUsageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10946,6 +12038,10 @@ func (_m *EC2) GetConsoleOutput(ctx context.Context, params *ec2.GetConsoleOutpu ret := _m.Called(_ca...) var r0 *ec2.GetConsoleOutputOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetConsoleOutputInput, ...func(*ec2.Options)) (*ec2.GetConsoleOutputOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetConsoleOutputInput, ...func(*ec2.Options)) *ec2.GetConsoleOutputOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10954,7 +12050,6 @@ func (_m *EC2) GetConsoleOutput(ctx context.Context, params *ec2.GetConsoleOutpu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetConsoleOutputInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -10976,6 +12071,10 @@ func (_m *EC2) GetConsoleScreenshot(ctx context.Context, params *ec2.GetConsoleS ret := _m.Called(_ca...) var r0 *ec2.GetConsoleScreenshotOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetConsoleScreenshotInput, ...func(*ec2.Options)) (*ec2.GetConsoleScreenshotOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetConsoleScreenshotInput, ...func(*ec2.Options)) *ec2.GetConsoleScreenshotOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -10984,7 +12083,6 @@ func (_m *EC2) GetConsoleScreenshot(ctx context.Context, params *ec2.GetConsoleS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetConsoleScreenshotInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11006,6 +12104,10 @@ func (_m *EC2) GetDefaultCreditSpecification(ctx context.Context, params *ec2.Ge ret := _m.Called(_ca...) var r0 *ec2.GetDefaultCreditSpecificationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetDefaultCreditSpecificationInput, ...func(*ec2.Options)) (*ec2.GetDefaultCreditSpecificationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetDefaultCreditSpecificationInput, ...func(*ec2.Options)) *ec2.GetDefaultCreditSpecificationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11014,7 +12116,6 @@ func (_m *EC2) GetDefaultCreditSpecification(ctx context.Context, params *ec2.Ge } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetDefaultCreditSpecificationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11036,6 +12137,10 @@ func (_m *EC2) GetEbsDefaultKmsKeyId(ctx context.Context, params *ec2.GetEbsDefa ret := _m.Called(_ca...) var r0 *ec2.GetEbsDefaultKmsKeyIdOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) (*ec2.GetEbsDefaultKmsKeyIdOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) *ec2.GetEbsDefaultKmsKeyIdOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11044,7 +12149,6 @@ func (_m *EC2) GetEbsDefaultKmsKeyId(ctx context.Context, params *ec2.GetEbsDefa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11066,6 +12170,10 @@ func (_m *EC2) GetEbsEncryptionByDefault(ctx context.Context, params *ec2.GetEbs ret := _m.Called(_ca...) var r0 *ec2.GetEbsEncryptionByDefaultOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetEbsEncryptionByDefaultInput, ...func(*ec2.Options)) (*ec2.GetEbsEncryptionByDefaultOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetEbsEncryptionByDefaultInput, ...func(*ec2.Options)) *ec2.GetEbsEncryptionByDefaultOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11074,7 +12182,6 @@ func (_m *EC2) GetEbsEncryptionByDefault(ctx context.Context, params *ec2.GetEbs } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetEbsEncryptionByDefaultInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11096,6 +12203,10 @@ func (_m *EC2) GetFlowLogsIntegrationTemplate(ctx context.Context, params *ec2.G ret := _m.Called(_ca...) var r0 *ec2.GetFlowLogsIntegrationTemplateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetFlowLogsIntegrationTemplateInput, ...func(*ec2.Options)) (*ec2.GetFlowLogsIntegrationTemplateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetFlowLogsIntegrationTemplateInput, ...func(*ec2.Options)) *ec2.GetFlowLogsIntegrationTemplateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11104,7 +12215,6 @@ func (_m *EC2) GetFlowLogsIntegrationTemplate(ctx context.Context, params *ec2.G } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetFlowLogsIntegrationTemplateInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11126,6 +12236,10 @@ func (_m *EC2) GetGroupsForCapacityReservation(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.GetGroupsForCapacityReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetGroupsForCapacityReservationInput, ...func(*ec2.Options)) (*ec2.GetGroupsForCapacityReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetGroupsForCapacityReservationInput, ...func(*ec2.Options)) *ec2.GetGroupsForCapacityReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11134,7 +12248,6 @@ func (_m *EC2) GetGroupsForCapacityReservation(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetGroupsForCapacityReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11156,6 +12269,10 @@ func (_m *EC2) GetHostReservationPurchasePreview(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.GetHostReservationPurchasePreviewOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetHostReservationPurchasePreviewInput, ...func(*ec2.Options)) (*ec2.GetHostReservationPurchasePreviewOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetHostReservationPurchasePreviewInput, ...func(*ec2.Options)) *ec2.GetHostReservationPurchasePreviewOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11164,7 +12281,6 @@ func (_m *EC2) GetHostReservationPurchasePreview(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetHostReservationPurchasePreviewInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11186,6 +12302,10 @@ func (_m *EC2) GetInstanceTypesFromInstanceRequirements(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ec2.GetInstanceTypesFromInstanceRequirementsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetInstanceTypesFromInstanceRequirementsInput, ...func(*ec2.Options)) (*ec2.GetInstanceTypesFromInstanceRequirementsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetInstanceTypesFromInstanceRequirementsInput, ...func(*ec2.Options)) *ec2.GetInstanceTypesFromInstanceRequirementsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11194,7 +12314,6 @@ func (_m *EC2) GetInstanceTypesFromInstanceRequirements(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetInstanceTypesFromInstanceRequirementsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11216,6 +12335,10 @@ func (_m *EC2) GetIpamAddressHistory(ctx context.Context, params *ec2.GetIpamAdd ret := _m.Called(_ca...) var r0 *ec2.GetIpamAddressHistoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamAddressHistoryInput, ...func(*ec2.Options)) (*ec2.GetIpamAddressHistoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamAddressHistoryInput, ...func(*ec2.Options)) *ec2.GetIpamAddressHistoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11224,7 +12347,6 @@ func (_m *EC2) GetIpamAddressHistory(ctx context.Context, params *ec2.GetIpamAdd } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetIpamAddressHistoryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11246,6 +12368,10 @@ func (_m *EC2) GetIpamPoolAllocations(ctx context.Context, params *ec2.GetIpamPo ret := _m.Called(_ca...) var r0 *ec2.GetIpamPoolAllocationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamPoolAllocationsInput, ...func(*ec2.Options)) (*ec2.GetIpamPoolAllocationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamPoolAllocationsInput, ...func(*ec2.Options)) *ec2.GetIpamPoolAllocationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11254,7 +12380,6 @@ func (_m *EC2) GetIpamPoolAllocations(ctx context.Context, params *ec2.GetIpamPo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetIpamPoolAllocationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11276,6 +12401,10 @@ func (_m *EC2) GetIpamPoolCidrs(ctx context.Context, params *ec2.GetIpamPoolCidr ret := _m.Called(_ca...) var r0 *ec2.GetIpamPoolCidrsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamPoolCidrsInput, ...func(*ec2.Options)) (*ec2.GetIpamPoolCidrsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamPoolCidrsInput, ...func(*ec2.Options)) *ec2.GetIpamPoolCidrsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11284,7 +12413,6 @@ func (_m *EC2) GetIpamPoolCidrs(ctx context.Context, params *ec2.GetIpamPoolCidr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetIpamPoolCidrsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11306,6 +12434,10 @@ func (_m *EC2) GetIpamResourceCidrs(ctx context.Context, params *ec2.GetIpamReso ret := _m.Called(_ca...) var r0 *ec2.GetIpamResourceCidrsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamResourceCidrsInput, ...func(*ec2.Options)) (*ec2.GetIpamResourceCidrsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetIpamResourceCidrsInput, ...func(*ec2.Options)) *ec2.GetIpamResourceCidrsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11314,7 +12446,6 @@ func (_m *EC2) GetIpamResourceCidrs(ctx context.Context, params *ec2.GetIpamReso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetIpamResourceCidrsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11336,6 +12467,10 @@ func (_m *EC2) GetLaunchTemplateData(ctx context.Context, params *ec2.GetLaunchT ret := _m.Called(_ca...) var r0 *ec2.GetLaunchTemplateDataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetLaunchTemplateDataInput, ...func(*ec2.Options)) (*ec2.GetLaunchTemplateDataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetLaunchTemplateDataInput, ...func(*ec2.Options)) *ec2.GetLaunchTemplateDataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11344,7 +12479,6 @@ func (_m *EC2) GetLaunchTemplateData(ctx context.Context, params *ec2.GetLaunchT } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetLaunchTemplateDataInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11366,6 +12500,10 @@ func (_m *EC2) GetManagedPrefixListAssociations(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.GetManagedPrefixListAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetManagedPrefixListAssociationsInput, ...func(*ec2.Options)) (*ec2.GetManagedPrefixListAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetManagedPrefixListAssociationsInput, ...func(*ec2.Options)) *ec2.GetManagedPrefixListAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11374,7 +12512,6 @@ func (_m *EC2) GetManagedPrefixListAssociations(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetManagedPrefixListAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11396,6 +12533,10 @@ func (_m *EC2) GetManagedPrefixListEntries(ctx context.Context, params *ec2.GetM ret := _m.Called(_ca...) var r0 *ec2.GetManagedPrefixListEntriesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetManagedPrefixListEntriesInput, ...func(*ec2.Options)) (*ec2.GetManagedPrefixListEntriesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetManagedPrefixListEntriesInput, ...func(*ec2.Options)) *ec2.GetManagedPrefixListEntriesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11404,7 +12545,6 @@ func (_m *EC2) GetManagedPrefixListEntries(ctx context.Context, params *ec2.GetM } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetManagedPrefixListEntriesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11426,6 +12566,10 @@ func (_m *EC2) GetNetworkInsightsAccessScopeAnalysisFindings(ctx context.Context ret := _m.Called(_ca...) var r0 *ec2.GetNetworkInsightsAccessScopeAnalysisFindingsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetNetworkInsightsAccessScopeAnalysisFindingsInput, ...func(*ec2.Options)) (*ec2.GetNetworkInsightsAccessScopeAnalysisFindingsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetNetworkInsightsAccessScopeAnalysisFindingsInput, ...func(*ec2.Options)) *ec2.GetNetworkInsightsAccessScopeAnalysisFindingsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11434,7 +12578,6 @@ func (_m *EC2) GetNetworkInsightsAccessScopeAnalysisFindings(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetNetworkInsightsAccessScopeAnalysisFindingsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11456,6 +12599,10 @@ func (_m *EC2) GetNetworkInsightsAccessScopeContent(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.GetNetworkInsightsAccessScopeContentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetNetworkInsightsAccessScopeContentInput, ...func(*ec2.Options)) (*ec2.GetNetworkInsightsAccessScopeContentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetNetworkInsightsAccessScopeContentInput, ...func(*ec2.Options)) *ec2.GetNetworkInsightsAccessScopeContentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11464,7 +12611,6 @@ func (_m *EC2) GetNetworkInsightsAccessScopeContent(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetNetworkInsightsAccessScopeContentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11486,6 +12632,10 @@ func (_m *EC2) GetPasswordData(ctx context.Context, params *ec2.GetPasswordDataI ret := _m.Called(_ca...) var r0 *ec2.GetPasswordDataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetPasswordDataInput, ...func(*ec2.Options)) (*ec2.GetPasswordDataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetPasswordDataInput, ...func(*ec2.Options)) *ec2.GetPasswordDataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11494,7 +12644,6 @@ func (_m *EC2) GetPasswordData(ctx context.Context, params *ec2.GetPasswordDataI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetPasswordDataInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11516,6 +12665,10 @@ func (_m *EC2) GetReservedInstancesExchangeQuote(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.GetReservedInstancesExchangeQuoteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetReservedInstancesExchangeQuoteInput, ...func(*ec2.Options)) (*ec2.GetReservedInstancesExchangeQuoteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetReservedInstancesExchangeQuoteInput, ...func(*ec2.Options)) *ec2.GetReservedInstancesExchangeQuoteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11524,7 +12677,6 @@ func (_m *EC2) GetReservedInstancesExchangeQuote(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetReservedInstancesExchangeQuoteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11546,6 +12698,10 @@ func (_m *EC2) GetSerialConsoleAccessStatus(ctx context.Context, params *ec2.Get ret := _m.Called(_ca...) var r0 *ec2.GetSerialConsoleAccessStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetSerialConsoleAccessStatusInput, ...func(*ec2.Options)) (*ec2.GetSerialConsoleAccessStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetSerialConsoleAccessStatusInput, ...func(*ec2.Options)) *ec2.GetSerialConsoleAccessStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11554,7 +12710,6 @@ func (_m *EC2) GetSerialConsoleAccessStatus(ctx context.Context, params *ec2.Get } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetSerialConsoleAccessStatusInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11576,6 +12731,10 @@ func (_m *EC2) GetSpotPlacementScores(ctx context.Context, params *ec2.GetSpotPl ret := _m.Called(_ca...) var r0 *ec2.GetSpotPlacementScoresOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetSpotPlacementScoresInput, ...func(*ec2.Options)) (*ec2.GetSpotPlacementScoresOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetSpotPlacementScoresInput, ...func(*ec2.Options)) *ec2.GetSpotPlacementScoresOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11584,7 +12743,6 @@ func (_m *EC2) GetSpotPlacementScores(ctx context.Context, params *ec2.GetSpotPl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetSpotPlacementScoresInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11606,6 +12764,10 @@ func (_m *EC2) GetSubnetCidrReservations(ctx context.Context, params *ec2.GetSub ret := _m.Called(_ca...) var r0 *ec2.GetSubnetCidrReservationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetSubnetCidrReservationsInput, ...func(*ec2.Options)) (*ec2.GetSubnetCidrReservationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetSubnetCidrReservationsInput, ...func(*ec2.Options)) *ec2.GetSubnetCidrReservationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11614,7 +12776,6 @@ func (_m *EC2) GetSubnetCidrReservations(ctx context.Context, params *ec2.GetSub } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetSubnetCidrReservationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11636,6 +12797,10 @@ func (_m *EC2) GetTransitGatewayAttachmentPropagations(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.GetTransitGatewayAttachmentPropagationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayAttachmentPropagationsInput, ...func(*ec2.Options)) (*ec2.GetTransitGatewayAttachmentPropagationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayAttachmentPropagationsInput, ...func(*ec2.Options)) *ec2.GetTransitGatewayAttachmentPropagationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11644,7 +12809,6 @@ func (_m *EC2) GetTransitGatewayAttachmentPropagations(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetTransitGatewayAttachmentPropagationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11666,6 +12830,10 @@ func (_m *EC2) GetTransitGatewayMulticastDomainAssociations(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.GetTransitGatewayMulticastDomainAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) (*ec2.GetTransitGatewayMulticastDomainAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) *ec2.GetTransitGatewayMulticastDomainAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11674,7 +12842,6 @@ func (_m *EC2) GetTransitGatewayMulticastDomainAssociations(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11696,6 +12863,10 @@ func (_m *EC2) GetTransitGatewayPrefixListReferences(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.GetTransitGatewayPrefixListReferencesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayPrefixListReferencesInput, ...func(*ec2.Options)) (*ec2.GetTransitGatewayPrefixListReferencesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayPrefixListReferencesInput, ...func(*ec2.Options)) *ec2.GetTransitGatewayPrefixListReferencesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11704,7 +12875,6 @@ func (_m *EC2) GetTransitGatewayPrefixListReferences(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetTransitGatewayPrefixListReferencesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11726,6 +12896,10 @@ func (_m *EC2) GetTransitGatewayRouteTableAssociations(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.GetTransitGatewayRouteTableAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayRouteTableAssociationsInput, ...func(*ec2.Options)) (*ec2.GetTransitGatewayRouteTableAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayRouteTableAssociationsInput, ...func(*ec2.Options)) *ec2.GetTransitGatewayRouteTableAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11734,7 +12908,6 @@ func (_m *EC2) GetTransitGatewayRouteTableAssociations(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetTransitGatewayRouteTableAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11756,6 +12929,10 @@ func (_m *EC2) GetTransitGatewayRouteTablePropagations(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.GetTransitGatewayRouteTablePropagationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayRouteTablePropagationsInput, ...func(*ec2.Options)) (*ec2.GetTransitGatewayRouteTablePropagationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetTransitGatewayRouteTablePropagationsInput, ...func(*ec2.Options)) *ec2.GetTransitGatewayRouteTablePropagationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11764,7 +12941,6 @@ func (_m *EC2) GetTransitGatewayRouteTablePropagations(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetTransitGatewayRouteTablePropagationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11786,6 +12962,10 @@ func (_m *EC2) GetVpnConnectionDeviceSampleConfiguration(ctx context.Context, pa ret := _m.Called(_ca...) var r0 *ec2.GetVpnConnectionDeviceSampleConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetVpnConnectionDeviceSampleConfigurationInput, ...func(*ec2.Options)) (*ec2.GetVpnConnectionDeviceSampleConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetVpnConnectionDeviceSampleConfigurationInput, ...func(*ec2.Options)) *ec2.GetVpnConnectionDeviceSampleConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11794,7 +12974,6 @@ func (_m *EC2) GetVpnConnectionDeviceSampleConfiguration(ctx context.Context, pa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetVpnConnectionDeviceSampleConfigurationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11816,6 +12995,10 @@ func (_m *EC2) GetVpnConnectionDeviceTypes(ctx context.Context, params *ec2.GetV ret := _m.Called(_ca...) var r0 *ec2.GetVpnConnectionDeviceTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetVpnConnectionDeviceTypesInput, ...func(*ec2.Options)) (*ec2.GetVpnConnectionDeviceTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.GetVpnConnectionDeviceTypesInput, ...func(*ec2.Options)) *ec2.GetVpnConnectionDeviceTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11824,7 +13007,6 @@ func (_m *EC2) GetVpnConnectionDeviceTypes(ctx context.Context, params *ec2.GetV } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.GetVpnConnectionDeviceTypesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11846,6 +13028,10 @@ func (_m *EC2) ImportClientVpnClientCertificateRevocationList(ctx context.Contex ret := _m.Called(_ca...) var r0 *ec2.ImportClientVpnClientCertificateRevocationListOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportClientVpnClientCertificateRevocationListInput, ...func(*ec2.Options)) (*ec2.ImportClientVpnClientCertificateRevocationListOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportClientVpnClientCertificateRevocationListInput, ...func(*ec2.Options)) *ec2.ImportClientVpnClientCertificateRevocationListOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11854,7 +13040,6 @@ func (_m *EC2) ImportClientVpnClientCertificateRevocationList(ctx context.Contex } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ImportClientVpnClientCertificateRevocationListInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11876,6 +13061,10 @@ func (_m *EC2) ImportImage(ctx context.Context, params *ec2.ImportImageInput, op ret := _m.Called(_ca...) var r0 *ec2.ImportImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportImageInput, ...func(*ec2.Options)) (*ec2.ImportImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportImageInput, ...func(*ec2.Options)) *ec2.ImportImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11884,7 +13073,6 @@ func (_m *EC2) ImportImage(ctx context.Context, params *ec2.ImportImageInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ImportImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11906,6 +13094,10 @@ func (_m *EC2) ImportInstance(ctx context.Context, params *ec2.ImportInstanceInp ret := _m.Called(_ca...) var r0 *ec2.ImportInstanceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportInstanceInput, ...func(*ec2.Options)) (*ec2.ImportInstanceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportInstanceInput, ...func(*ec2.Options)) *ec2.ImportInstanceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11914,7 +13106,6 @@ func (_m *EC2) ImportInstance(ctx context.Context, params *ec2.ImportInstanceInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ImportInstanceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11936,6 +13127,10 @@ func (_m *EC2) ImportKeyPair(ctx context.Context, params *ec2.ImportKeyPairInput ret := _m.Called(_ca...) var r0 *ec2.ImportKeyPairOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportKeyPairInput, ...func(*ec2.Options)) (*ec2.ImportKeyPairOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportKeyPairInput, ...func(*ec2.Options)) *ec2.ImportKeyPairOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11944,7 +13139,6 @@ func (_m *EC2) ImportKeyPair(ctx context.Context, params *ec2.ImportKeyPairInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ImportKeyPairInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11966,6 +13160,10 @@ func (_m *EC2) ImportSnapshot(ctx context.Context, params *ec2.ImportSnapshotInp ret := _m.Called(_ca...) var r0 *ec2.ImportSnapshotOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportSnapshotInput, ...func(*ec2.Options)) (*ec2.ImportSnapshotOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportSnapshotInput, ...func(*ec2.Options)) *ec2.ImportSnapshotOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -11974,7 +13172,6 @@ func (_m *EC2) ImportSnapshot(ctx context.Context, params *ec2.ImportSnapshotInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ImportSnapshotInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -11996,6 +13193,10 @@ func (_m *EC2) ImportVolume(ctx context.Context, params *ec2.ImportVolumeInput, ret := _m.Called(_ca...) var r0 *ec2.ImportVolumeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportVolumeInput, ...func(*ec2.Options)) (*ec2.ImportVolumeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ImportVolumeInput, ...func(*ec2.Options)) *ec2.ImportVolumeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12004,7 +13205,6 @@ func (_m *EC2) ImportVolume(ctx context.Context, params *ec2.ImportVolumeInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ImportVolumeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12026,6 +13226,10 @@ func (_m *EC2) ListImagesInRecycleBin(ctx context.Context, params *ec2.ListImage ret := _m.Called(_ca...) var r0 *ec2.ListImagesInRecycleBinOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ListImagesInRecycleBinInput, ...func(*ec2.Options)) (*ec2.ListImagesInRecycleBinOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ListImagesInRecycleBinInput, ...func(*ec2.Options)) *ec2.ListImagesInRecycleBinOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12034,7 +13238,6 @@ func (_m *EC2) ListImagesInRecycleBin(ctx context.Context, params *ec2.ListImage } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ListImagesInRecycleBinInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12056,6 +13259,10 @@ func (_m *EC2) ListSnapshotsInRecycleBin(ctx context.Context, params *ec2.ListSn ret := _m.Called(_ca...) var r0 *ec2.ListSnapshotsInRecycleBinOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ListSnapshotsInRecycleBinInput, ...func(*ec2.Options)) (*ec2.ListSnapshotsInRecycleBinOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ListSnapshotsInRecycleBinInput, ...func(*ec2.Options)) *ec2.ListSnapshotsInRecycleBinOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12064,7 +13271,6 @@ func (_m *EC2) ListSnapshotsInRecycleBin(ctx context.Context, params *ec2.ListSn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ListSnapshotsInRecycleBinInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12086,6 +13292,10 @@ func (_m *EC2) ModifyAddressAttribute(ctx context.Context, params *ec2.ModifyAdd ret := _m.Called(_ca...) var r0 *ec2.ModifyAddressAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyAddressAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyAddressAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyAddressAttributeInput, ...func(*ec2.Options)) *ec2.ModifyAddressAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12094,7 +13304,6 @@ func (_m *EC2) ModifyAddressAttribute(ctx context.Context, params *ec2.ModifyAdd } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyAddressAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12116,6 +13325,10 @@ func (_m *EC2) ModifyAvailabilityZoneGroup(ctx context.Context, params *ec2.Modi ret := _m.Called(_ca...) var r0 *ec2.ModifyAvailabilityZoneGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyAvailabilityZoneGroupInput, ...func(*ec2.Options)) (*ec2.ModifyAvailabilityZoneGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyAvailabilityZoneGroupInput, ...func(*ec2.Options)) *ec2.ModifyAvailabilityZoneGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12124,7 +13337,6 @@ func (_m *EC2) ModifyAvailabilityZoneGroup(ctx context.Context, params *ec2.Modi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyAvailabilityZoneGroupInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12146,6 +13358,10 @@ func (_m *EC2) ModifyCapacityReservation(ctx context.Context, params *ec2.Modify ret := _m.Called(_ca...) var r0 *ec2.ModifyCapacityReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyCapacityReservationInput, ...func(*ec2.Options)) (*ec2.ModifyCapacityReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyCapacityReservationInput, ...func(*ec2.Options)) *ec2.ModifyCapacityReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12154,7 +13370,6 @@ func (_m *EC2) ModifyCapacityReservation(ctx context.Context, params *ec2.Modify } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyCapacityReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12176,6 +13391,10 @@ func (_m *EC2) ModifyCapacityReservationFleet(ctx context.Context, params *ec2.M ret := _m.Called(_ca...) var r0 *ec2.ModifyCapacityReservationFleetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyCapacityReservationFleetInput, ...func(*ec2.Options)) (*ec2.ModifyCapacityReservationFleetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyCapacityReservationFleetInput, ...func(*ec2.Options)) *ec2.ModifyCapacityReservationFleetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12184,7 +13403,6 @@ func (_m *EC2) ModifyCapacityReservationFleet(ctx context.Context, params *ec2.M } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyCapacityReservationFleetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12206,6 +13424,10 @@ func (_m *EC2) ModifyClientVpnEndpoint(ctx context.Context, params *ec2.ModifyCl ret := _m.Called(_ca...) var r0 *ec2.ModifyClientVpnEndpointOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyClientVpnEndpointInput, ...func(*ec2.Options)) (*ec2.ModifyClientVpnEndpointOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyClientVpnEndpointInput, ...func(*ec2.Options)) *ec2.ModifyClientVpnEndpointOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12214,7 +13436,6 @@ func (_m *EC2) ModifyClientVpnEndpoint(ctx context.Context, params *ec2.ModifyCl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyClientVpnEndpointInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12236,6 +13457,10 @@ func (_m *EC2) ModifyDefaultCreditSpecification(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.ModifyDefaultCreditSpecificationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyDefaultCreditSpecificationInput, ...func(*ec2.Options)) (*ec2.ModifyDefaultCreditSpecificationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyDefaultCreditSpecificationInput, ...func(*ec2.Options)) *ec2.ModifyDefaultCreditSpecificationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12244,7 +13469,6 @@ func (_m *EC2) ModifyDefaultCreditSpecification(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyDefaultCreditSpecificationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12266,6 +13490,10 @@ func (_m *EC2) ModifyEbsDefaultKmsKeyId(ctx context.Context, params *ec2.ModifyE ret := _m.Called(_ca...) var r0 *ec2.ModifyEbsDefaultKmsKeyIdOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) (*ec2.ModifyEbsDefaultKmsKeyIdOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) *ec2.ModifyEbsDefaultKmsKeyIdOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12274,7 +13502,6 @@ func (_m *EC2) ModifyEbsDefaultKmsKeyId(ctx context.Context, params *ec2.ModifyE } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12296,6 +13523,10 @@ func (_m *EC2) ModifyFleet(ctx context.Context, params *ec2.ModifyFleetInput, op ret := _m.Called(_ca...) var r0 *ec2.ModifyFleetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyFleetInput, ...func(*ec2.Options)) (*ec2.ModifyFleetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyFleetInput, ...func(*ec2.Options)) *ec2.ModifyFleetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12304,7 +13535,6 @@ func (_m *EC2) ModifyFleet(ctx context.Context, params *ec2.ModifyFleetInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyFleetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12326,6 +13556,10 @@ func (_m *EC2) ModifyFpgaImageAttribute(ctx context.Context, params *ec2.ModifyF ret := _m.Called(_ca...) var r0 *ec2.ModifyFpgaImageAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyFpgaImageAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyFpgaImageAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyFpgaImageAttributeInput, ...func(*ec2.Options)) *ec2.ModifyFpgaImageAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12334,7 +13568,6 @@ func (_m *EC2) ModifyFpgaImageAttribute(ctx context.Context, params *ec2.ModifyF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyFpgaImageAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12356,6 +13589,10 @@ func (_m *EC2) ModifyHosts(ctx context.Context, params *ec2.ModifyHostsInput, op ret := _m.Called(_ca...) var r0 *ec2.ModifyHostsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyHostsInput, ...func(*ec2.Options)) (*ec2.ModifyHostsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyHostsInput, ...func(*ec2.Options)) *ec2.ModifyHostsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12364,7 +13601,6 @@ func (_m *EC2) ModifyHosts(ctx context.Context, params *ec2.ModifyHostsInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyHostsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12386,6 +13622,10 @@ func (_m *EC2) ModifyIdFormat(ctx context.Context, params *ec2.ModifyIdFormatInp ret := _m.Called(_ca...) var r0 *ec2.ModifyIdFormatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIdFormatInput, ...func(*ec2.Options)) (*ec2.ModifyIdFormatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIdFormatInput, ...func(*ec2.Options)) *ec2.ModifyIdFormatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12394,7 +13634,6 @@ func (_m *EC2) ModifyIdFormat(ctx context.Context, params *ec2.ModifyIdFormatInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyIdFormatInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12416,6 +13655,10 @@ func (_m *EC2) ModifyIdentityIdFormat(ctx context.Context, params *ec2.ModifyIde ret := _m.Called(_ca...) var r0 *ec2.ModifyIdentityIdFormatOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIdentityIdFormatInput, ...func(*ec2.Options)) (*ec2.ModifyIdentityIdFormatOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIdentityIdFormatInput, ...func(*ec2.Options)) *ec2.ModifyIdentityIdFormatOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12424,7 +13667,6 @@ func (_m *EC2) ModifyIdentityIdFormat(ctx context.Context, params *ec2.ModifyIde } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyIdentityIdFormatInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12446,6 +13688,10 @@ func (_m *EC2) ModifyImageAttribute(ctx context.Context, params *ec2.ModifyImage ret := _m.Called(_ca...) var r0 *ec2.ModifyImageAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyImageAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyImageAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyImageAttributeInput, ...func(*ec2.Options)) *ec2.ModifyImageAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12454,7 +13700,6 @@ func (_m *EC2) ModifyImageAttribute(ctx context.Context, params *ec2.ModifyImage } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyImageAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12476,6 +13721,10 @@ func (_m *EC2) ModifyInstanceAttribute(ctx context.Context, params *ec2.ModifyIn ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceAttributeInput, ...func(*ec2.Options)) *ec2.ModifyInstanceAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12484,7 +13733,6 @@ func (_m *EC2) ModifyInstanceAttribute(ctx context.Context, params *ec2.ModifyIn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12506,6 +13754,10 @@ func (_m *EC2) ModifyInstanceCapacityReservationAttributes(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceCapacityReservationAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceCapacityReservationAttributesInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceCapacityReservationAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceCapacityReservationAttributesInput, ...func(*ec2.Options)) *ec2.ModifyInstanceCapacityReservationAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12514,7 +13766,6 @@ func (_m *EC2) ModifyInstanceCapacityReservationAttributes(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceCapacityReservationAttributesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12536,6 +13787,10 @@ func (_m *EC2) ModifyInstanceCreditSpecification(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceCreditSpecificationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceCreditSpecificationInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceCreditSpecificationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceCreditSpecificationInput, ...func(*ec2.Options)) *ec2.ModifyInstanceCreditSpecificationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12544,7 +13799,6 @@ func (_m *EC2) ModifyInstanceCreditSpecification(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceCreditSpecificationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12566,6 +13820,10 @@ func (_m *EC2) ModifyInstanceEventStartTime(ctx context.Context, params *ec2.Mod ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceEventStartTimeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceEventStartTimeInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceEventStartTimeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceEventStartTimeInput, ...func(*ec2.Options)) *ec2.ModifyInstanceEventStartTimeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12574,7 +13832,6 @@ func (_m *EC2) ModifyInstanceEventStartTime(ctx context.Context, params *ec2.Mod } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceEventStartTimeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12596,6 +13853,10 @@ func (_m *EC2) ModifyInstanceEventWindow(ctx context.Context, params *ec2.Modify ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceEventWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceEventWindowInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceEventWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceEventWindowInput, ...func(*ec2.Options)) *ec2.ModifyInstanceEventWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12604,7 +13865,6 @@ func (_m *EC2) ModifyInstanceEventWindow(ctx context.Context, params *ec2.Modify } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceEventWindowInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12626,6 +13886,10 @@ func (_m *EC2) ModifyInstanceMaintenanceOptions(ctx context.Context, params *ec2 ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceMaintenanceOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceMaintenanceOptionsInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceMaintenanceOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceMaintenanceOptionsInput, ...func(*ec2.Options)) *ec2.ModifyInstanceMaintenanceOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12634,7 +13898,6 @@ func (_m *EC2) ModifyInstanceMaintenanceOptions(ctx context.Context, params *ec2 } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceMaintenanceOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12656,6 +13919,10 @@ func (_m *EC2) ModifyInstanceMetadataOptions(ctx context.Context, params *ec2.Mo ret := _m.Called(_ca...) var r0 *ec2.ModifyInstanceMetadataOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceMetadataOptionsInput, ...func(*ec2.Options)) (*ec2.ModifyInstanceMetadataOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstanceMetadataOptionsInput, ...func(*ec2.Options)) *ec2.ModifyInstanceMetadataOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12664,7 +13931,6 @@ func (_m *EC2) ModifyInstanceMetadataOptions(ctx context.Context, params *ec2.Mo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstanceMetadataOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12686,6 +13952,10 @@ func (_m *EC2) ModifyInstancePlacement(ctx context.Context, params *ec2.ModifyIn ret := _m.Called(_ca...) var r0 *ec2.ModifyInstancePlacementOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstancePlacementInput, ...func(*ec2.Options)) (*ec2.ModifyInstancePlacementOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyInstancePlacementInput, ...func(*ec2.Options)) *ec2.ModifyInstancePlacementOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12694,7 +13964,6 @@ func (_m *EC2) ModifyInstancePlacement(ctx context.Context, params *ec2.ModifyIn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyInstancePlacementInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12716,6 +13985,10 @@ func (_m *EC2) ModifyIpam(ctx context.Context, params *ec2.ModifyIpamInput, optF ret := _m.Called(_ca...) var r0 *ec2.ModifyIpamOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamInput, ...func(*ec2.Options)) (*ec2.ModifyIpamOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamInput, ...func(*ec2.Options)) *ec2.ModifyIpamOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12724,7 +13997,6 @@ func (_m *EC2) ModifyIpam(ctx context.Context, params *ec2.ModifyIpamInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyIpamInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12746,6 +14018,10 @@ func (_m *EC2) ModifyIpamPool(ctx context.Context, params *ec2.ModifyIpamPoolInp ret := _m.Called(_ca...) var r0 *ec2.ModifyIpamPoolOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamPoolInput, ...func(*ec2.Options)) (*ec2.ModifyIpamPoolOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamPoolInput, ...func(*ec2.Options)) *ec2.ModifyIpamPoolOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12754,7 +14030,6 @@ func (_m *EC2) ModifyIpamPool(ctx context.Context, params *ec2.ModifyIpamPoolInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyIpamPoolInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12776,7 +14051,11 @@ func (_m *EC2) ModifyIpamResourceCidr(ctx context.Context, params *ec2.ModifyIpa ret := _m.Called(_ca...) var r0 *ec2.ModifyIpamResourceCidrOutput - if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamResourceCidrInput, ...func(*ec2.Options)) *ec2.ModifyIpamResourceCidrOutput); ok { + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamResourceCidrInput, ...func(*ec2.Options)) (*ec2.ModifyIpamResourceCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamResourceCidrInput, ...func(*ec2.Options)) *ec2.ModifyIpamResourceCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { if ret.Get(0) != nil { @@ -12784,7 +14063,6 @@ func (_m *EC2) ModifyIpamResourceCidr(ctx context.Context, params *ec2.ModifyIpa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyIpamResourceCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12806,6 +14084,10 @@ func (_m *EC2) ModifyIpamScope(ctx context.Context, params *ec2.ModifyIpamScopeI ret := _m.Called(_ca...) var r0 *ec2.ModifyIpamScopeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamScopeInput, ...func(*ec2.Options)) (*ec2.ModifyIpamScopeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyIpamScopeInput, ...func(*ec2.Options)) *ec2.ModifyIpamScopeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12814,7 +14096,6 @@ func (_m *EC2) ModifyIpamScope(ctx context.Context, params *ec2.ModifyIpamScopeI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyIpamScopeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12836,6 +14117,10 @@ func (_m *EC2) ModifyLaunchTemplate(ctx context.Context, params *ec2.ModifyLaunc ret := _m.Called(_ca...) var r0 *ec2.ModifyLaunchTemplateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyLaunchTemplateInput, ...func(*ec2.Options)) (*ec2.ModifyLaunchTemplateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyLaunchTemplateInput, ...func(*ec2.Options)) *ec2.ModifyLaunchTemplateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12844,7 +14129,6 @@ func (_m *EC2) ModifyLaunchTemplate(ctx context.Context, params *ec2.ModifyLaunc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyLaunchTemplateInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12866,6 +14150,10 @@ func (_m *EC2) ModifyManagedPrefixList(ctx context.Context, params *ec2.ModifyMa ret := _m.Called(_ca...) var r0 *ec2.ModifyManagedPrefixListOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyManagedPrefixListInput, ...func(*ec2.Options)) (*ec2.ModifyManagedPrefixListOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyManagedPrefixListInput, ...func(*ec2.Options)) *ec2.ModifyManagedPrefixListOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12874,7 +14162,6 @@ func (_m *EC2) ModifyManagedPrefixList(ctx context.Context, params *ec2.ModifyMa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyManagedPrefixListInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12896,6 +14183,10 @@ func (_m *EC2) ModifyNetworkInterfaceAttribute(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.ModifyNetworkInterfaceAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyNetworkInterfaceAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyNetworkInterfaceAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyNetworkInterfaceAttributeInput, ...func(*ec2.Options)) *ec2.ModifyNetworkInterfaceAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12904,7 +14195,6 @@ func (_m *EC2) ModifyNetworkInterfaceAttribute(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyNetworkInterfaceAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12926,6 +14216,10 @@ func (_m *EC2) ModifyPrivateDnsNameOptions(ctx context.Context, params *ec2.Modi ret := _m.Called(_ca...) var r0 *ec2.ModifyPrivateDnsNameOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyPrivateDnsNameOptionsInput, ...func(*ec2.Options)) (*ec2.ModifyPrivateDnsNameOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyPrivateDnsNameOptionsInput, ...func(*ec2.Options)) *ec2.ModifyPrivateDnsNameOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12934,7 +14228,6 @@ func (_m *EC2) ModifyPrivateDnsNameOptions(ctx context.Context, params *ec2.Modi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyPrivateDnsNameOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12956,6 +14249,10 @@ func (_m *EC2) ModifyReservedInstances(ctx context.Context, params *ec2.ModifyRe ret := _m.Called(_ca...) var r0 *ec2.ModifyReservedInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyReservedInstancesInput, ...func(*ec2.Options)) (*ec2.ModifyReservedInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyReservedInstancesInput, ...func(*ec2.Options)) *ec2.ModifyReservedInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12964,7 +14261,6 @@ func (_m *EC2) ModifyReservedInstances(ctx context.Context, params *ec2.ModifyRe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyReservedInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -12986,6 +14282,10 @@ func (_m *EC2) ModifySecurityGroupRules(ctx context.Context, params *ec2.ModifyS ret := _m.Called(_ca...) var r0 *ec2.ModifySecurityGroupRulesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySecurityGroupRulesInput, ...func(*ec2.Options)) (*ec2.ModifySecurityGroupRulesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySecurityGroupRulesInput, ...func(*ec2.Options)) *ec2.ModifySecurityGroupRulesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -12994,7 +14294,6 @@ func (_m *EC2) ModifySecurityGroupRules(ctx context.Context, params *ec2.ModifyS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifySecurityGroupRulesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13016,6 +14315,10 @@ func (_m *EC2) ModifySnapshotAttribute(ctx context.Context, params *ec2.ModifySn ret := _m.Called(_ca...) var r0 *ec2.ModifySnapshotAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySnapshotAttributeInput, ...func(*ec2.Options)) (*ec2.ModifySnapshotAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySnapshotAttributeInput, ...func(*ec2.Options)) *ec2.ModifySnapshotAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13024,7 +14327,6 @@ func (_m *EC2) ModifySnapshotAttribute(ctx context.Context, params *ec2.ModifySn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifySnapshotAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13046,6 +14348,10 @@ func (_m *EC2) ModifySnapshotTier(ctx context.Context, params *ec2.ModifySnapsho ret := _m.Called(_ca...) var r0 *ec2.ModifySnapshotTierOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySnapshotTierInput, ...func(*ec2.Options)) (*ec2.ModifySnapshotTierOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySnapshotTierInput, ...func(*ec2.Options)) *ec2.ModifySnapshotTierOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13054,7 +14360,6 @@ func (_m *EC2) ModifySnapshotTier(ctx context.Context, params *ec2.ModifySnapsho } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifySnapshotTierInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13076,6 +14381,10 @@ func (_m *EC2) ModifySpotFleetRequest(ctx context.Context, params *ec2.ModifySpo ret := _m.Called(_ca...) var r0 *ec2.ModifySpotFleetRequestOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySpotFleetRequestInput, ...func(*ec2.Options)) (*ec2.ModifySpotFleetRequestOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySpotFleetRequestInput, ...func(*ec2.Options)) *ec2.ModifySpotFleetRequestOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13084,7 +14393,6 @@ func (_m *EC2) ModifySpotFleetRequest(ctx context.Context, params *ec2.ModifySpo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifySpotFleetRequestInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13106,6 +14414,10 @@ func (_m *EC2) ModifySubnetAttribute(ctx context.Context, params *ec2.ModifySubn ret := _m.Called(_ca...) var r0 *ec2.ModifySubnetAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySubnetAttributeInput, ...func(*ec2.Options)) (*ec2.ModifySubnetAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifySubnetAttributeInput, ...func(*ec2.Options)) *ec2.ModifySubnetAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13114,7 +14426,6 @@ func (_m *EC2) ModifySubnetAttribute(ctx context.Context, params *ec2.ModifySubn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifySubnetAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13136,6 +14447,10 @@ func (_m *EC2) ModifyTrafficMirrorFilterNetworkServices(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ec2.ModifyTrafficMirrorFilterNetworkServicesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTrafficMirrorFilterNetworkServicesInput, ...func(*ec2.Options)) (*ec2.ModifyTrafficMirrorFilterNetworkServicesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTrafficMirrorFilterNetworkServicesInput, ...func(*ec2.Options)) *ec2.ModifyTrafficMirrorFilterNetworkServicesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13144,7 +14459,6 @@ func (_m *EC2) ModifyTrafficMirrorFilterNetworkServices(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyTrafficMirrorFilterNetworkServicesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13166,6 +14480,10 @@ func (_m *EC2) ModifyTrafficMirrorFilterRule(ctx context.Context, params *ec2.Mo ret := _m.Called(_ca...) var r0 *ec2.ModifyTrafficMirrorFilterRuleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) (*ec2.ModifyTrafficMirrorFilterRuleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) *ec2.ModifyTrafficMirrorFilterRuleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13174,7 +14492,6 @@ func (_m *EC2) ModifyTrafficMirrorFilterRule(ctx context.Context, params *ec2.Mo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyTrafficMirrorFilterRuleInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13196,6 +14513,10 @@ func (_m *EC2) ModifyTrafficMirrorSession(ctx context.Context, params *ec2.Modif ret := _m.Called(_ca...) var r0 *ec2.ModifyTrafficMirrorSessionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTrafficMirrorSessionInput, ...func(*ec2.Options)) (*ec2.ModifyTrafficMirrorSessionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTrafficMirrorSessionInput, ...func(*ec2.Options)) *ec2.ModifyTrafficMirrorSessionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13204,7 +14525,6 @@ func (_m *EC2) ModifyTrafficMirrorSession(ctx context.Context, params *ec2.Modif } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyTrafficMirrorSessionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13226,6 +14546,10 @@ func (_m *EC2) ModifyTransitGateway(ctx context.Context, params *ec2.ModifyTrans ret := _m.Called(_ca...) var r0 *ec2.ModifyTransitGatewayOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTransitGatewayInput, ...func(*ec2.Options)) (*ec2.ModifyTransitGatewayOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTransitGatewayInput, ...func(*ec2.Options)) *ec2.ModifyTransitGatewayOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13234,7 +14558,6 @@ func (_m *EC2) ModifyTransitGateway(ctx context.Context, params *ec2.ModifyTrans } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyTransitGatewayInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13256,6 +14579,10 @@ func (_m *EC2) ModifyTransitGatewayPrefixListReference(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.ModifyTransitGatewayPrefixListReferenceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) (*ec2.ModifyTransitGatewayPrefixListReferenceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) *ec2.ModifyTransitGatewayPrefixListReferenceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13264,7 +14591,6 @@ func (_m *EC2) ModifyTransitGatewayPrefixListReference(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyTransitGatewayPrefixListReferenceInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13286,6 +14612,10 @@ func (_m *EC2) ModifyTransitGatewayVpcAttachment(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.ModifyTransitGatewayVpcAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) (*ec2.ModifyTransitGatewayVpcAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) *ec2.ModifyTransitGatewayVpcAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13294,7 +14624,6 @@ func (_m *EC2) ModifyTransitGatewayVpcAttachment(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13316,6 +14645,10 @@ func (_m *EC2) ModifyVolume(ctx context.Context, params *ec2.ModifyVolumeInput, ret := _m.Called(_ca...) var r0 *ec2.ModifyVolumeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVolumeInput, ...func(*ec2.Options)) (*ec2.ModifyVolumeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVolumeInput, ...func(*ec2.Options)) *ec2.ModifyVolumeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13324,7 +14657,6 @@ func (_m *EC2) ModifyVolume(ctx context.Context, params *ec2.ModifyVolumeInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVolumeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13346,6 +14678,10 @@ func (_m *EC2) ModifyVolumeAttribute(ctx context.Context, params *ec2.ModifyVolu ret := _m.Called(_ca...) var r0 *ec2.ModifyVolumeAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVolumeAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyVolumeAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVolumeAttributeInput, ...func(*ec2.Options)) *ec2.ModifyVolumeAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13354,7 +14690,6 @@ func (_m *EC2) ModifyVolumeAttribute(ctx context.Context, params *ec2.ModifyVolu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVolumeAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13376,6 +14711,10 @@ func (_m *EC2) ModifyVpcAttribute(ctx context.Context, params *ec2.ModifyVpcAttr ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcAttributeInput, ...func(*ec2.Options)) (*ec2.ModifyVpcAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcAttributeInput, ...func(*ec2.Options)) *ec2.ModifyVpcAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13384,7 +14723,6 @@ func (_m *EC2) ModifyVpcAttribute(ctx context.Context, params *ec2.ModifyVpcAttr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13406,6 +14744,10 @@ func (_m *EC2) ModifyVpcEndpoint(ctx context.Context, params *ec2.ModifyVpcEndpo ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcEndpointOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointInput, ...func(*ec2.Options)) (*ec2.ModifyVpcEndpointOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointInput, ...func(*ec2.Options)) *ec2.ModifyVpcEndpointOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13414,7 +14756,6 @@ func (_m *EC2) ModifyVpcEndpoint(ctx context.Context, params *ec2.ModifyVpcEndpo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcEndpointInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13436,6 +14777,10 @@ func (_m *EC2) ModifyVpcEndpointConnectionNotification(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcEndpointConnectionNotificationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointConnectionNotificationInput, ...func(*ec2.Options)) (*ec2.ModifyVpcEndpointConnectionNotificationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointConnectionNotificationInput, ...func(*ec2.Options)) *ec2.ModifyVpcEndpointConnectionNotificationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13444,7 +14789,6 @@ func (_m *EC2) ModifyVpcEndpointConnectionNotification(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcEndpointConnectionNotificationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13466,6 +14810,10 @@ func (_m *EC2) ModifyVpcEndpointServiceConfiguration(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcEndpointServiceConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointServiceConfigurationInput, ...func(*ec2.Options)) (*ec2.ModifyVpcEndpointServiceConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointServiceConfigurationInput, ...func(*ec2.Options)) *ec2.ModifyVpcEndpointServiceConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13474,7 +14822,6 @@ func (_m *EC2) ModifyVpcEndpointServiceConfiguration(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcEndpointServiceConfigurationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13496,6 +14843,10 @@ func (_m *EC2) ModifyVpcEndpointServicePayerResponsibility(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcEndpointServicePayerResponsibilityOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointServicePayerResponsibilityInput, ...func(*ec2.Options)) (*ec2.ModifyVpcEndpointServicePayerResponsibilityOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointServicePayerResponsibilityInput, ...func(*ec2.Options)) *ec2.ModifyVpcEndpointServicePayerResponsibilityOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13504,7 +14855,6 @@ func (_m *EC2) ModifyVpcEndpointServicePayerResponsibility(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcEndpointServicePayerResponsibilityInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13526,6 +14876,10 @@ func (_m *EC2) ModifyVpcEndpointServicePermissions(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcEndpointServicePermissionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointServicePermissionsInput, ...func(*ec2.Options)) (*ec2.ModifyVpcEndpointServicePermissionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcEndpointServicePermissionsInput, ...func(*ec2.Options)) *ec2.ModifyVpcEndpointServicePermissionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13534,7 +14888,6 @@ func (_m *EC2) ModifyVpcEndpointServicePermissions(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcEndpointServicePermissionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13556,6 +14909,10 @@ func (_m *EC2) ModifyVpcPeeringConnectionOptions(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcPeeringConnectionOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcPeeringConnectionOptionsInput, ...func(*ec2.Options)) (*ec2.ModifyVpcPeeringConnectionOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcPeeringConnectionOptionsInput, ...func(*ec2.Options)) *ec2.ModifyVpcPeeringConnectionOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13564,7 +14921,6 @@ func (_m *EC2) ModifyVpcPeeringConnectionOptions(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcPeeringConnectionOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13586,6 +14942,10 @@ func (_m *EC2) ModifyVpcTenancy(ctx context.Context, params *ec2.ModifyVpcTenanc ret := _m.Called(_ca...) var r0 *ec2.ModifyVpcTenancyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcTenancyInput, ...func(*ec2.Options)) (*ec2.ModifyVpcTenancyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpcTenancyInput, ...func(*ec2.Options)) *ec2.ModifyVpcTenancyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13594,7 +14954,6 @@ func (_m *EC2) ModifyVpcTenancy(ctx context.Context, params *ec2.ModifyVpcTenanc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpcTenancyInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13616,6 +14975,10 @@ func (_m *EC2) ModifyVpnConnection(ctx context.Context, params *ec2.ModifyVpnCon ret := _m.Called(_ca...) var r0 *ec2.ModifyVpnConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnConnectionInput, ...func(*ec2.Options)) (*ec2.ModifyVpnConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnConnectionInput, ...func(*ec2.Options)) *ec2.ModifyVpnConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13624,7 +14987,6 @@ func (_m *EC2) ModifyVpnConnection(ctx context.Context, params *ec2.ModifyVpnCon } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpnConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13646,6 +15008,10 @@ func (_m *EC2) ModifyVpnConnectionOptions(ctx context.Context, params *ec2.Modif ret := _m.Called(_ca...) var r0 *ec2.ModifyVpnConnectionOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnConnectionOptionsInput, ...func(*ec2.Options)) (*ec2.ModifyVpnConnectionOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnConnectionOptionsInput, ...func(*ec2.Options)) *ec2.ModifyVpnConnectionOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13654,7 +15020,6 @@ func (_m *EC2) ModifyVpnConnectionOptions(ctx context.Context, params *ec2.Modif } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpnConnectionOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13676,6 +15041,10 @@ func (_m *EC2) ModifyVpnTunnelCertificate(ctx context.Context, params *ec2.Modif ret := _m.Called(_ca...) var r0 *ec2.ModifyVpnTunnelCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnTunnelCertificateInput, ...func(*ec2.Options)) (*ec2.ModifyVpnTunnelCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnTunnelCertificateInput, ...func(*ec2.Options)) *ec2.ModifyVpnTunnelCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13684,7 +15053,6 @@ func (_m *EC2) ModifyVpnTunnelCertificate(ctx context.Context, params *ec2.Modif } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpnTunnelCertificateInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13706,6 +15074,10 @@ func (_m *EC2) ModifyVpnTunnelOptions(ctx context.Context, params *ec2.ModifyVpn ret := _m.Called(_ca...) var r0 *ec2.ModifyVpnTunnelOptionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnTunnelOptionsInput, ...func(*ec2.Options)) (*ec2.ModifyVpnTunnelOptionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ModifyVpnTunnelOptionsInput, ...func(*ec2.Options)) *ec2.ModifyVpnTunnelOptionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13714,7 +15086,6 @@ func (_m *EC2) ModifyVpnTunnelOptions(ctx context.Context, params *ec2.ModifyVpn } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ModifyVpnTunnelOptionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13736,6 +15107,10 @@ func (_m *EC2) MonitorInstances(ctx context.Context, params *ec2.MonitorInstance ret := _m.Called(_ca...) var r0 *ec2.MonitorInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.MonitorInstancesInput, ...func(*ec2.Options)) (*ec2.MonitorInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.MonitorInstancesInput, ...func(*ec2.Options)) *ec2.MonitorInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13744,7 +15119,6 @@ func (_m *EC2) MonitorInstances(ctx context.Context, params *ec2.MonitorInstance } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.MonitorInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13766,6 +15140,10 @@ func (_m *EC2) MoveAddressToVpc(ctx context.Context, params *ec2.MoveAddressToVp ret := _m.Called(_ca...) var r0 *ec2.MoveAddressToVpcOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.MoveAddressToVpcInput, ...func(*ec2.Options)) (*ec2.MoveAddressToVpcOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.MoveAddressToVpcInput, ...func(*ec2.Options)) *ec2.MoveAddressToVpcOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13774,7 +15152,6 @@ func (_m *EC2) MoveAddressToVpc(ctx context.Context, params *ec2.MoveAddressToVp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.MoveAddressToVpcInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13796,6 +15173,10 @@ func (_m *EC2) MoveByoipCidrToIpam(ctx context.Context, params *ec2.MoveByoipCid ret := _m.Called(_ca...) var r0 *ec2.MoveByoipCidrToIpamOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.MoveByoipCidrToIpamInput, ...func(*ec2.Options)) (*ec2.MoveByoipCidrToIpamOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.MoveByoipCidrToIpamInput, ...func(*ec2.Options)) *ec2.MoveByoipCidrToIpamOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13804,7 +15185,6 @@ func (_m *EC2) MoveByoipCidrToIpam(ctx context.Context, params *ec2.MoveByoipCid } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.MoveByoipCidrToIpamInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13826,6 +15206,10 @@ func (_m *EC2) ProvisionByoipCidr(ctx context.Context, params *ec2.ProvisionByoi ret := _m.Called(_ca...) var r0 *ec2.ProvisionByoipCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ProvisionByoipCidrInput, ...func(*ec2.Options)) (*ec2.ProvisionByoipCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ProvisionByoipCidrInput, ...func(*ec2.Options)) *ec2.ProvisionByoipCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13834,7 +15218,6 @@ func (_m *EC2) ProvisionByoipCidr(ctx context.Context, params *ec2.ProvisionByoi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ProvisionByoipCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13856,6 +15239,10 @@ func (_m *EC2) ProvisionIpamPoolCidr(ctx context.Context, params *ec2.ProvisionI ret := _m.Called(_ca...) var r0 *ec2.ProvisionIpamPoolCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ProvisionIpamPoolCidrInput, ...func(*ec2.Options)) (*ec2.ProvisionIpamPoolCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ProvisionIpamPoolCidrInput, ...func(*ec2.Options)) *ec2.ProvisionIpamPoolCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13864,7 +15251,6 @@ func (_m *EC2) ProvisionIpamPoolCidr(ctx context.Context, params *ec2.ProvisionI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ProvisionIpamPoolCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13886,6 +15272,10 @@ func (_m *EC2) ProvisionPublicIpv4PoolCidr(ctx context.Context, params *ec2.Prov ret := _m.Called(_ca...) var r0 *ec2.ProvisionPublicIpv4PoolCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ProvisionPublicIpv4PoolCidrInput, ...func(*ec2.Options)) (*ec2.ProvisionPublicIpv4PoolCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ProvisionPublicIpv4PoolCidrInput, ...func(*ec2.Options)) *ec2.ProvisionPublicIpv4PoolCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13894,7 +15284,6 @@ func (_m *EC2) ProvisionPublicIpv4PoolCidr(ctx context.Context, params *ec2.Prov } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ProvisionPublicIpv4PoolCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13916,6 +15305,10 @@ func (_m *EC2) PurchaseHostReservation(ctx context.Context, params *ec2.Purchase ret := _m.Called(_ca...) var r0 *ec2.PurchaseHostReservationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.PurchaseHostReservationInput, ...func(*ec2.Options)) (*ec2.PurchaseHostReservationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.PurchaseHostReservationInput, ...func(*ec2.Options)) *ec2.PurchaseHostReservationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13924,7 +15317,6 @@ func (_m *EC2) PurchaseHostReservation(ctx context.Context, params *ec2.Purchase } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.PurchaseHostReservationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13946,6 +15338,10 @@ func (_m *EC2) PurchaseReservedInstancesOffering(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.PurchaseReservedInstancesOfferingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.PurchaseReservedInstancesOfferingInput, ...func(*ec2.Options)) (*ec2.PurchaseReservedInstancesOfferingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.PurchaseReservedInstancesOfferingInput, ...func(*ec2.Options)) *ec2.PurchaseReservedInstancesOfferingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13954,7 +15350,6 @@ func (_m *EC2) PurchaseReservedInstancesOffering(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.PurchaseReservedInstancesOfferingInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -13976,6 +15371,10 @@ func (_m *EC2) PurchaseScheduledInstances(ctx context.Context, params *ec2.Purch ret := _m.Called(_ca...) var r0 *ec2.PurchaseScheduledInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.PurchaseScheduledInstancesInput, ...func(*ec2.Options)) (*ec2.PurchaseScheduledInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.PurchaseScheduledInstancesInput, ...func(*ec2.Options)) *ec2.PurchaseScheduledInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -13984,7 +15383,6 @@ func (_m *EC2) PurchaseScheduledInstances(ctx context.Context, params *ec2.Purch } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.PurchaseScheduledInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14006,6 +15404,10 @@ func (_m *EC2) RebootInstances(ctx context.Context, params *ec2.RebootInstancesI ret := _m.Called(_ca...) var r0 *ec2.RebootInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RebootInstancesInput, ...func(*ec2.Options)) (*ec2.RebootInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RebootInstancesInput, ...func(*ec2.Options)) *ec2.RebootInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14014,7 +15416,6 @@ func (_m *EC2) RebootInstances(ctx context.Context, params *ec2.RebootInstancesI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RebootInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14036,6 +15437,10 @@ func (_m *EC2) RegisterImage(ctx context.Context, params *ec2.RegisterImageInput ret := _m.Called(_ca...) var r0 *ec2.RegisterImageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterImageInput, ...func(*ec2.Options)) (*ec2.RegisterImageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterImageInput, ...func(*ec2.Options)) *ec2.RegisterImageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14044,7 +15449,6 @@ func (_m *EC2) RegisterImage(ctx context.Context, params *ec2.RegisterImageInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RegisterImageInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14066,6 +15470,10 @@ func (_m *EC2) RegisterInstanceEventNotificationAttributes(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.RegisterInstanceEventNotificationAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) (*ec2.RegisterInstanceEventNotificationAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) *ec2.RegisterInstanceEventNotificationAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14074,7 +15482,6 @@ func (_m *EC2) RegisterInstanceEventNotificationAttributes(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RegisterInstanceEventNotificationAttributesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14096,6 +15503,10 @@ func (_m *EC2) RegisterTransitGatewayMulticastGroupMembers(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.RegisterTransitGatewayMulticastGroupMembersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterTransitGatewayMulticastGroupMembersInput, ...func(*ec2.Options)) (*ec2.RegisterTransitGatewayMulticastGroupMembersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterTransitGatewayMulticastGroupMembersInput, ...func(*ec2.Options)) *ec2.RegisterTransitGatewayMulticastGroupMembersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14104,7 +15515,6 @@ func (_m *EC2) RegisterTransitGatewayMulticastGroupMembers(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RegisterTransitGatewayMulticastGroupMembersInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14126,6 +15536,10 @@ func (_m *EC2) RegisterTransitGatewayMulticastGroupSources(ctx context.Context, ret := _m.Called(_ca...) var r0 *ec2.RegisterTransitGatewayMulticastGroupSourcesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterTransitGatewayMulticastGroupSourcesInput, ...func(*ec2.Options)) (*ec2.RegisterTransitGatewayMulticastGroupSourcesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RegisterTransitGatewayMulticastGroupSourcesInput, ...func(*ec2.Options)) *ec2.RegisterTransitGatewayMulticastGroupSourcesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14134,7 +15548,6 @@ func (_m *EC2) RegisterTransitGatewayMulticastGroupSources(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RegisterTransitGatewayMulticastGroupSourcesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14156,6 +15569,10 @@ func (_m *EC2) RejectTransitGatewayMulticastDomainAssociations(ctx context.Conte ret := _m.Called(_ca...) var r0 *ec2.RejectTransitGatewayMulticastDomainAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) (*ec2.RejectTransitGatewayMulticastDomainAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) *ec2.RejectTransitGatewayMulticastDomainAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14164,7 +15581,6 @@ func (_m *EC2) RejectTransitGatewayMulticastDomainAssociations(ctx context.Conte } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RejectTransitGatewayMulticastDomainAssociationsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14186,6 +15602,10 @@ func (_m *EC2) RejectTransitGatewayPeeringAttachment(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.RejectTransitGatewayPeeringAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) (*ec2.RejectTransitGatewayPeeringAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) *ec2.RejectTransitGatewayPeeringAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14194,7 +15614,6 @@ func (_m *EC2) RejectTransitGatewayPeeringAttachment(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RejectTransitGatewayPeeringAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14216,6 +15635,10 @@ func (_m *EC2) RejectTransitGatewayVpcAttachment(ctx context.Context, params *ec ret := _m.Called(_ca...) var r0 *ec2.RejectTransitGatewayVpcAttachmentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) (*ec2.RejectTransitGatewayVpcAttachmentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) *ec2.RejectTransitGatewayVpcAttachmentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14224,7 +15647,6 @@ func (_m *EC2) RejectTransitGatewayVpcAttachment(ctx context.Context, params *ec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RejectTransitGatewayVpcAttachmentInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14246,6 +15668,10 @@ func (_m *EC2) RejectVpcEndpointConnections(ctx context.Context, params *ec2.Rej ret := _m.Called(_ca...) var r0 *ec2.RejectVpcEndpointConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectVpcEndpointConnectionsInput, ...func(*ec2.Options)) (*ec2.RejectVpcEndpointConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectVpcEndpointConnectionsInput, ...func(*ec2.Options)) *ec2.RejectVpcEndpointConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14254,7 +15680,6 @@ func (_m *EC2) RejectVpcEndpointConnections(ctx context.Context, params *ec2.Rej } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RejectVpcEndpointConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14276,6 +15701,10 @@ func (_m *EC2) RejectVpcPeeringConnection(ctx context.Context, params *ec2.Rejec ret := _m.Called(_ca...) var r0 *ec2.RejectVpcPeeringConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectVpcPeeringConnectionInput, ...func(*ec2.Options)) (*ec2.RejectVpcPeeringConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RejectVpcPeeringConnectionInput, ...func(*ec2.Options)) *ec2.RejectVpcPeeringConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14284,7 +15713,6 @@ func (_m *EC2) RejectVpcPeeringConnection(ctx context.Context, params *ec2.Rejec } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RejectVpcPeeringConnectionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14306,6 +15734,10 @@ func (_m *EC2) ReleaseAddress(ctx context.Context, params *ec2.ReleaseAddressInp ret := _m.Called(_ca...) var r0 *ec2.ReleaseAddressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReleaseAddressInput, ...func(*ec2.Options)) (*ec2.ReleaseAddressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReleaseAddressInput, ...func(*ec2.Options)) *ec2.ReleaseAddressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14314,7 +15746,6 @@ func (_m *EC2) ReleaseAddress(ctx context.Context, params *ec2.ReleaseAddressInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReleaseAddressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14336,6 +15767,10 @@ func (_m *EC2) ReleaseHosts(ctx context.Context, params *ec2.ReleaseHostsInput, ret := _m.Called(_ca...) var r0 *ec2.ReleaseHostsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReleaseHostsInput, ...func(*ec2.Options)) (*ec2.ReleaseHostsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReleaseHostsInput, ...func(*ec2.Options)) *ec2.ReleaseHostsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14344,7 +15779,6 @@ func (_m *EC2) ReleaseHosts(ctx context.Context, params *ec2.ReleaseHostsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReleaseHostsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14366,6 +15800,10 @@ func (_m *EC2) ReleaseIpamPoolAllocation(ctx context.Context, params *ec2.Releas ret := _m.Called(_ca...) var r0 *ec2.ReleaseIpamPoolAllocationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReleaseIpamPoolAllocationInput, ...func(*ec2.Options)) (*ec2.ReleaseIpamPoolAllocationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReleaseIpamPoolAllocationInput, ...func(*ec2.Options)) *ec2.ReleaseIpamPoolAllocationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14374,7 +15812,6 @@ func (_m *EC2) ReleaseIpamPoolAllocation(ctx context.Context, params *ec2.Releas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReleaseIpamPoolAllocationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14396,6 +15833,10 @@ func (_m *EC2) ReplaceIamInstanceProfileAssociation(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ec2.ReplaceIamInstanceProfileAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceIamInstanceProfileAssociationInput, ...func(*ec2.Options)) (*ec2.ReplaceIamInstanceProfileAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceIamInstanceProfileAssociationInput, ...func(*ec2.Options)) *ec2.ReplaceIamInstanceProfileAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14404,7 +15845,6 @@ func (_m *EC2) ReplaceIamInstanceProfileAssociation(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReplaceIamInstanceProfileAssociationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14426,6 +15866,10 @@ func (_m *EC2) ReplaceNetworkAclAssociation(ctx context.Context, params *ec2.Rep ret := _m.Called(_ca...) var r0 *ec2.ReplaceNetworkAclAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceNetworkAclAssociationInput, ...func(*ec2.Options)) (*ec2.ReplaceNetworkAclAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceNetworkAclAssociationInput, ...func(*ec2.Options)) *ec2.ReplaceNetworkAclAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14434,7 +15878,6 @@ func (_m *EC2) ReplaceNetworkAclAssociation(ctx context.Context, params *ec2.Rep } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReplaceNetworkAclAssociationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14456,6 +15899,10 @@ func (_m *EC2) ReplaceNetworkAclEntry(ctx context.Context, params *ec2.ReplaceNe ret := _m.Called(_ca...) var r0 *ec2.ReplaceNetworkAclEntryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceNetworkAclEntryInput, ...func(*ec2.Options)) (*ec2.ReplaceNetworkAclEntryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceNetworkAclEntryInput, ...func(*ec2.Options)) *ec2.ReplaceNetworkAclEntryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14464,7 +15911,6 @@ func (_m *EC2) ReplaceNetworkAclEntry(ctx context.Context, params *ec2.ReplaceNe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReplaceNetworkAclEntryInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14486,6 +15932,10 @@ func (_m *EC2) ReplaceRoute(ctx context.Context, params *ec2.ReplaceRouteInput, ret := _m.Called(_ca...) var r0 *ec2.ReplaceRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceRouteInput, ...func(*ec2.Options)) (*ec2.ReplaceRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceRouteInput, ...func(*ec2.Options)) *ec2.ReplaceRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14494,7 +15944,6 @@ func (_m *EC2) ReplaceRoute(ctx context.Context, params *ec2.ReplaceRouteInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReplaceRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14516,6 +15965,10 @@ func (_m *EC2) ReplaceRouteTableAssociation(ctx context.Context, params *ec2.Rep ret := _m.Called(_ca...) var r0 *ec2.ReplaceRouteTableAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceRouteTableAssociationInput, ...func(*ec2.Options)) (*ec2.ReplaceRouteTableAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceRouteTableAssociationInput, ...func(*ec2.Options)) *ec2.ReplaceRouteTableAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14524,7 +15977,6 @@ func (_m *EC2) ReplaceRouteTableAssociation(ctx context.Context, params *ec2.Rep } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReplaceRouteTableAssociationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14546,6 +15998,10 @@ func (_m *EC2) ReplaceTransitGatewayRoute(ctx context.Context, params *ec2.Repla ret := _m.Called(_ca...) var r0 *ec2.ReplaceTransitGatewayRouteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceTransitGatewayRouteInput, ...func(*ec2.Options)) (*ec2.ReplaceTransitGatewayRouteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReplaceTransitGatewayRouteInput, ...func(*ec2.Options)) *ec2.ReplaceTransitGatewayRouteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14554,7 +16010,6 @@ func (_m *EC2) ReplaceTransitGatewayRoute(ctx context.Context, params *ec2.Repla } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReplaceTransitGatewayRouteInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14576,6 +16031,10 @@ func (_m *EC2) ReportInstanceStatus(ctx context.Context, params *ec2.ReportInsta ret := _m.Called(_ca...) var r0 *ec2.ReportInstanceStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReportInstanceStatusInput, ...func(*ec2.Options)) (*ec2.ReportInstanceStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ReportInstanceStatusInput, ...func(*ec2.Options)) *ec2.ReportInstanceStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14584,7 +16043,6 @@ func (_m *EC2) ReportInstanceStatus(ctx context.Context, params *ec2.ReportInsta } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ReportInstanceStatusInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14606,6 +16064,10 @@ func (_m *EC2) RequestSpotFleet(ctx context.Context, params *ec2.RequestSpotFlee ret := _m.Called(_ca...) var r0 *ec2.RequestSpotFleetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RequestSpotFleetInput, ...func(*ec2.Options)) (*ec2.RequestSpotFleetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RequestSpotFleetInput, ...func(*ec2.Options)) *ec2.RequestSpotFleetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14614,7 +16076,6 @@ func (_m *EC2) RequestSpotFleet(ctx context.Context, params *ec2.RequestSpotFlee } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RequestSpotFleetInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14636,6 +16097,10 @@ func (_m *EC2) RequestSpotInstances(ctx context.Context, params *ec2.RequestSpot ret := _m.Called(_ca...) var r0 *ec2.RequestSpotInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RequestSpotInstancesInput, ...func(*ec2.Options)) (*ec2.RequestSpotInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RequestSpotInstancesInput, ...func(*ec2.Options)) *ec2.RequestSpotInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14644,7 +16109,6 @@ func (_m *EC2) RequestSpotInstances(ctx context.Context, params *ec2.RequestSpot } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RequestSpotInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14666,6 +16130,10 @@ func (_m *EC2) ResetAddressAttribute(ctx context.Context, params *ec2.ResetAddre ret := _m.Called(_ca...) var r0 *ec2.ResetAddressAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetAddressAttributeInput, ...func(*ec2.Options)) (*ec2.ResetAddressAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetAddressAttributeInput, ...func(*ec2.Options)) *ec2.ResetAddressAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14674,7 +16142,6 @@ func (_m *EC2) ResetAddressAttribute(ctx context.Context, params *ec2.ResetAddre } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetAddressAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14696,6 +16163,10 @@ func (_m *EC2) ResetEbsDefaultKmsKeyId(ctx context.Context, params *ec2.ResetEbs ret := _m.Called(_ca...) var r0 *ec2.ResetEbsDefaultKmsKeyIdOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) (*ec2.ResetEbsDefaultKmsKeyIdOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) *ec2.ResetEbsDefaultKmsKeyIdOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14704,7 +16175,6 @@ func (_m *EC2) ResetEbsDefaultKmsKeyId(ctx context.Context, params *ec2.ResetEbs } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetEbsDefaultKmsKeyIdInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14726,6 +16196,10 @@ func (_m *EC2) ResetFpgaImageAttribute(ctx context.Context, params *ec2.ResetFpg ret := _m.Called(_ca...) var r0 *ec2.ResetFpgaImageAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetFpgaImageAttributeInput, ...func(*ec2.Options)) (*ec2.ResetFpgaImageAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetFpgaImageAttributeInput, ...func(*ec2.Options)) *ec2.ResetFpgaImageAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14734,7 +16208,6 @@ func (_m *EC2) ResetFpgaImageAttribute(ctx context.Context, params *ec2.ResetFpg } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetFpgaImageAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14756,6 +16229,10 @@ func (_m *EC2) ResetImageAttribute(ctx context.Context, params *ec2.ResetImageAt ret := _m.Called(_ca...) var r0 *ec2.ResetImageAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetImageAttributeInput, ...func(*ec2.Options)) (*ec2.ResetImageAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetImageAttributeInput, ...func(*ec2.Options)) *ec2.ResetImageAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14764,7 +16241,6 @@ func (_m *EC2) ResetImageAttribute(ctx context.Context, params *ec2.ResetImageAt } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetImageAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14786,6 +16262,10 @@ func (_m *EC2) ResetInstanceAttribute(ctx context.Context, params *ec2.ResetInst ret := _m.Called(_ca...) var r0 *ec2.ResetInstanceAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetInstanceAttributeInput, ...func(*ec2.Options)) (*ec2.ResetInstanceAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetInstanceAttributeInput, ...func(*ec2.Options)) *ec2.ResetInstanceAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14794,7 +16274,6 @@ func (_m *EC2) ResetInstanceAttribute(ctx context.Context, params *ec2.ResetInst } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetInstanceAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14816,6 +16295,10 @@ func (_m *EC2) ResetNetworkInterfaceAttribute(ctx context.Context, params *ec2.R ret := _m.Called(_ca...) var r0 *ec2.ResetNetworkInterfaceAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetNetworkInterfaceAttributeInput, ...func(*ec2.Options)) (*ec2.ResetNetworkInterfaceAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetNetworkInterfaceAttributeInput, ...func(*ec2.Options)) *ec2.ResetNetworkInterfaceAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14824,7 +16307,6 @@ func (_m *EC2) ResetNetworkInterfaceAttribute(ctx context.Context, params *ec2.R } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetNetworkInterfaceAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14846,6 +16328,10 @@ func (_m *EC2) ResetSnapshotAttribute(ctx context.Context, params *ec2.ResetSnap ret := _m.Called(_ca...) var r0 *ec2.ResetSnapshotAttributeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetSnapshotAttributeInput, ...func(*ec2.Options)) (*ec2.ResetSnapshotAttributeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.ResetSnapshotAttributeInput, ...func(*ec2.Options)) *ec2.ResetSnapshotAttributeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14854,7 +16340,6 @@ func (_m *EC2) ResetSnapshotAttribute(ctx context.Context, params *ec2.ResetSnap } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.ResetSnapshotAttributeInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14876,6 +16361,10 @@ func (_m *EC2) RestoreAddressToClassic(ctx context.Context, params *ec2.RestoreA ret := _m.Called(_ca...) var r0 *ec2.RestoreAddressToClassicOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreAddressToClassicInput, ...func(*ec2.Options)) (*ec2.RestoreAddressToClassicOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreAddressToClassicInput, ...func(*ec2.Options)) *ec2.RestoreAddressToClassicOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14884,7 +16373,6 @@ func (_m *EC2) RestoreAddressToClassic(ctx context.Context, params *ec2.RestoreA } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RestoreAddressToClassicInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14906,6 +16394,10 @@ func (_m *EC2) RestoreImageFromRecycleBin(ctx context.Context, params *ec2.Resto ret := _m.Called(_ca...) var r0 *ec2.RestoreImageFromRecycleBinOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreImageFromRecycleBinInput, ...func(*ec2.Options)) (*ec2.RestoreImageFromRecycleBinOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreImageFromRecycleBinInput, ...func(*ec2.Options)) *ec2.RestoreImageFromRecycleBinOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14914,7 +16406,6 @@ func (_m *EC2) RestoreImageFromRecycleBin(ctx context.Context, params *ec2.Resto } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RestoreImageFromRecycleBinInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14936,6 +16427,10 @@ func (_m *EC2) RestoreManagedPrefixListVersion(ctx context.Context, params *ec2. ret := _m.Called(_ca...) var r0 *ec2.RestoreManagedPrefixListVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreManagedPrefixListVersionInput, ...func(*ec2.Options)) (*ec2.RestoreManagedPrefixListVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreManagedPrefixListVersionInput, ...func(*ec2.Options)) *ec2.RestoreManagedPrefixListVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14944,7 +16439,6 @@ func (_m *EC2) RestoreManagedPrefixListVersion(ctx context.Context, params *ec2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RestoreManagedPrefixListVersionInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14966,6 +16460,10 @@ func (_m *EC2) RestoreSnapshotFromRecycleBin(ctx context.Context, params *ec2.Re ret := _m.Called(_ca...) var r0 *ec2.RestoreSnapshotFromRecycleBinOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreSnapshotFromRecycleBinInput, ...func(*ec2.Options)) (*ec2.RestoreSnapshotFromRecycleBinOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreSnapshotFromRecycleBinInput, ...func(*ec2.Options)) *ec2.RestoreSnapshotFromRecycleBinOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -14974,7 +16472,6 @@ func (_m *EC2) RestoreSnapshotFromRecycleBin(ctx context.Context, params *ec2.Re } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RestoreSnapshotFromRecycleBinInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -14996,6 +16493,10 @@ func (_m *EC2) RestoreSnapshotTier(ctx context.Context, params *ec2.RestoreSnaps ret := _m.Called(_ca...) var r0 *ec2.RestoreSnapshotTierOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreSnapshotTierInput, ...func(*ec2.Options)) (*ec2.RestoreSnapshotTierOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RestoreSnapshotTierInput, ...func(*ec2.Options)) *ec2.RestoreSnapshotTierOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15004,7 +16505,6 @@ func (_m *EC2) RestoreSnapshotTier(ctx context.Context, params *ec2.RestoreSnaps } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RestoreSnapshotTierInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15026,6 +16526,10 @@ func (_m *EC2) RevokeClientVpnIngress(ctx context.Context, params *ec2.RevokeCli ret := _m.Called(_ca...) var r0 *ec2.RevokeClientVpnIngressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RevokeClientVpnIngressInput, ...func(*ec2.Options)) (*ec2.RevokeClientVpnIngressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RevokeClientVpnIngressInput, ...func(*ec2.Options)) *ec2.RevokeClientVpnIngressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15034,7 +16538,6 @@ func (_m *EC2) RevokeClientVpnIngress(ctx context.Context, params *ec2.RevokeCli } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RevokeClientVpnIngressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15056,6 +16559,10 @@ func (_m *EC2) RevokeSecurityGroupEgress(ctx context.Context, params *ec2.Revoke ret := _m.Called(_ca...) var r0 *ec2.RevokeSecurityGroupEgressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RevokeSecurityGroupEgressInput, ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupEgressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RevokeSecurityGroupEgressInput, ...func(*ec2.Options)) *ec2.RevokeSecurityGroupEgressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15064,7 +16571,6 @@ func (_m *EC2) RevokeSecurityGroupEgress(ctx context.Context, params *ec2.Revoke } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RevokeSecurityGroupEgressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15086,6 +16592,10 @@ func (_m *EC2) RevokeSecurityGroupIngress(ctx context.Context, params *ec2.Revok ret := _m.Called(_ca...) var r0 *ec2.RevokeSecurityGroupIngressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RevokeSecurityGroupIngressInput, ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupIngressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RevokeSecurityGroupIngressInput, ...func(*ec2.Options)) *ec2.RevokeSecurityGroupIngressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15094,7 +16604,6 @@ func (_m *EC2) RevokeSecurityGroupIngress(ctx context.Context, params *ec2.Revok } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RevokeSecurityGroupIngressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15116,6 +16625,10 @@ func (_m *EC2) RunInstances(ctx context.Context, params *ec2.RunInstancesInput, ret := _m.Called(_ca...) var r0 *ec2.RunInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RunInstancesInput, ...func(*ec2.Options)) (*ec2.RunInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RunInstancesInput, ...func(*ec2.Options)) *ec2.RunInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15124,7 +16637,6 @@ func (_m *EC2) RunInstances(ctx context.Context, params *ec2.RunInstancesInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RunInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15146,6 +16658,10 @@ func (_m *EC2) RunScheduledInstances(ctx context.Context, params *ec2.RunSchedul ret := _m.Called(_ca...) var r0 *ec2.RunScheduledInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.RunScheduledInstancesInput, ...func(*ec2.Options)) (*ec2.RunScheduledInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.RunScheduledInstancesInput, ...func(*ec2.Options)) *ec2.RunScheduledInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15154,7 +16670,6 @@ func (_m *EC2) RunScheduledInstances(ctx context.Context, params *ec2.RunSchedul } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.RunScheduledInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15176,6 +16691,10 @@ func (_m *EC2) SearchLocalGatewayRoutes(ctx context.Context, params *ec2.SearchL ret := _m.Called(_ca...) var r0 *ec2.SearchLocalGatewayRoutesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.SearchLocalGatewayRoutesInput, ...func(*ec2.Options)) (*ec2.SearchLocalGatewayRoutesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.SearchLocalGatewayRoutesInput, ...func(*ec2.Options)) *ec2.SearchLocalGatewayRoutesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15184,7 +16703,6 @@ func (_m *EC2) SearchLocalGatewayRoutes(ctx context.Context, params *ec2.SearchL } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.SearchLocalGatewayRoutesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15206,6 +16724,10 @@ func (_m *EC2) SearchTransitGatewayMulticastGroups(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ec2.SearchTransitGatewayMulticastGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.SearchTransitGatewayMulticastGroupsInput, ...func(*ec2.Options)) (*ec2.SearchTransitGatewayMulticastGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.SearchTransitGatewayMulticastGroupsInput, ...func(*ec2.Options)) *ec2.SearchTransitGatewayMulticastGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15214,7 +16736,6 @@ func (_m *EC2) SearchTransitGatewayMulticastGroups(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.SearchTransitGatewayMulticastGroupsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15236,6 +16757,10 @@ func (_m *EC2) SearchTransitGatewayRoutes(ctx context.Context, params *ec2.Searc ret := _m.Called(_ca...) var r0 *ec2.SearchTransitGatewayRoutesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.SearchTransitGatewayRoutesInput, ...func(*ec2.Options)) (*ec2.SearchTransitGatewayRoutesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.SearchTransitGatewayRoutesInput, ...func(*ec2.Options)) *ec2.SearchTransitGatewayRoutesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15244,7 +16769,6 @@ func (_m *EC2) SearchTransitGatewayRoutes(ctx context.Context, params *ec2.Searc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.SearchTransitGatewayRoutesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15266,6 +16790,10 @@ func (_m *EC2) SendDiagnosticInterrupt(ctx context.Context, params *ec2.SendDiag ret := _m.Called(_ca...) var r0 *ec2.SendDiagnosticInterruptOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.SendDiagnosticInterruptInput, ...func(*ec2.Options)) (*ec2.SendDiagnosticInterruptOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.SendDiagnosticInterruptInput, ...func(*ec2.Options)) *ec2.SendDiagnosticInterruptOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15274,7 +16802,6 @@ func (_m *EC2) SendDiagnosticInterrupt(ctx context.Context, params *ec2.SendDiag } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.SendDiagnosticInterruptInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15296,6 +16823,10 @@ func (_m *EC2) StartInstances(ctx context.Context, params *ec2.StartInstancesInp ret := _m.Called(_ca...) var r0 *ec2.StartInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartInstancesInput, ...func(*ec2.Options)) (*ec2.StartInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartInstancesInput, ...func(*ec2.Options)) *ec2.StartInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15304,7 +16835,6 @@ func (_m *EC2) StartInstances(ctx context.Context, params *ec2.StartInstancesInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.StartInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15326,6 +16856,10 @@ func (_m *EC2) StartNetworkInsightsAccessScopeAnalysis(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ec2.StartNetworkInsightsAccessScopeAnalysisOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartNetworkInsightsAccessScopeAnalysisInput, ...func(*ec2.Options)) (*ec2.StartNetworkInsightsAccessScopeAnalysisOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartNetworkInsightsAccessScopeAnalysisInput, ...func(*ec2.Options)) *ec2.StartNetworkInsightsAccessScopeAnalysisOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15334,7 +16868,6 @@ func (_m *EC2) StartNetworkInsightsAccessScopeAnalysis(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.StartNetworkInsightsAccessScopeAnalysisInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15356,6 +16889,10 @@ func (_m *EC2) StartNetworkInsightsAnalysis(ctx context.Context, params *ec2.Sta ret := _m.Called(_ca...) var r0 *ec2.StartNetworkInsightsAnalysisOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartNetworkInsightsAnalysisInput, ...func(*ec2.Options)) (*ec2.StartNetworkInsightsAnalysisOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartNetworkInsightsAnalysisInput, ...func(*ec2.Options)) *ec2.StartNetworkInsightsAnalysisOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15364,7 +16901,6 @@ func (_m *EC2) StartNetworkInsightsAnalysis(ctx context.Context, params *ec2.Sta } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.StartNetworkInsightsAnalysisInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15386,6 +16922,10 @@ func (_m *EC2) StartVpcEndpointServicePrivateDnsVerification(ctx context.Context ret := _m.Called(_ca...) var r0 *ec2.StartVpcEndpointServicePrivateDnsVerificationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartVpcEndpointServicePrivateDnsVerificationInput, ...func(*ec2.Options)) (*ec2.StartVpcEndpointServicePrivateDnsVerificationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.StartVpcEndpointServicePrivateDnsVerificationInput, ...func(*ec2.Options)) *ec2.StartVpcEndpointServicePrivateDnsVerificationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15394,7 +16934,6 @@ func (_m *EC2) StartVpcEndpointServicePrivateDnsVerification(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.StartVpcEndpointServicePrivateDnsVerificationInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15416,6 +16955,10 @@ func (_m *EC2) StopInstances(ctx context.Context, params *ec2.StopInstancesInput ret := _m.Called(_ca...) var r0 *ec2.StopInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.StopInstancesInput, ...func(*ec2.Options)) (*ec2.StopInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.StopInstancesInput, ...func(*ec2.Options)) *ec2.StopInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15424,7 +16967,6 @@ func (_m *EC2) StopInstances(ctx context.Context, params *ec2.StopInstancesInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.StopInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15446,6 +16988,10 @@ func (_m *EC2) TerminateClientVpnConnections(ctx context.Context, params *ec2.Te ret := _m.Called(_ca...) var r0 *ec2.TerminateClientVpnConnectionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.TerminateClientVpnConnectionsInput, ...func(*ec2.Options)) (*ec2.TerminateClientVpnConnectionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.TerminateClientVpnConnectionsInput, ...func(*ec2.Options)) *ec2.TerminateClientVpnConnectionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15454,7 +17000,6 @@ func (_m *EC2) TerminateClientVpnConnections(ctx context.Context, params *ec2.Te } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.TerminateClientVpnConnectionsInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15476,6 +17021,10 @@ func (_m *EC2) TerminateInstances(ctx context.Context, params *ec2.TerminateInst ret := _m.Called(_ca...) var r0 *ec2.TerminateInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.TerminateInstancesInput, ...func(*ec2.Options)) (*ec2.TerminateInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.TerminateInstancesInput, ...func(*ec2.Options)) *ec2.TerminateInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15484,7 +17033,6 @@ func (_m *EC2) TerminateInstances(ctx context.Context, params *ec2.TerminateInst } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.TerminateInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15506,6 +17054,10 @@ func (_m *EC2) UnassignIpv6Addresses(ctx context.Context, params *ec2.UnassignIp ret := _m.Called(_ca...) var r0 *ec2.UnassignIpv6AddressesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.UnassignIpv6AddressesInput, ...func(*ec2.Options)) (*ec2.UnassignIpv6AddressesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.UnassignIpv6AddressesInput, ...func(*ec2.Options)) *ec2.UnassignIpv6AddressesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15514,7 +17066,6 @@ func (_m *EC2) UnassignIpv6Addresses(ctx context.Context, params *ec2.UnassignIp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.UnassignIpv6AddressesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15536,6 +17087,10 @@ func (_m *EC2) UnassignPrivateIpAddresses(ctx context.Context, params *ec2.Unass ret := _m.Called(_ca...) var r0 *ec2.UnassignPrivateIpAddressesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.UnassignPrivateIpAddressesInput, ...func(*ec2.Options)) (*ec2.UnassignPrivateIpAddressesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.UnassignPrivateIpAddressesInput, ...func(*ec2.Options)) *ec2.UnassignPrivateIpAddressesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15544,7 +17099,6 @@ func (_m *EC2) UnassignPrivateIpAddresses(ctx context.Context, params *ec2.Unass } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.UnassignPrivateIpAddressesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15566,6 +17120,10 @@ func (_m *EC2) UnmonitorInstances(ctx context.Context, params *ec2.UnmonitorInst ret := _m.Called(_ca...) var r0 *ec2.UnmonitorInstancesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.UnmonitorInstancesInput, ...func(*ec2.Options)) (*ec2.UnmonitorInstancesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.UnmonitorInstancesInput, ...func(*ec2.Options)) *ec2.UnmonitorInstancesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15574,7 +17132,6 @@ func (_m *EC2) UnmonitorInstances(ctx context.Context, params *ec2.UnmonitorInst } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.UnmonitorInstancesInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15596,6 +17153,10 @@ func (_m *EC2) UpdateSecurityGroupRuleDescriptionsEgress(ctx context.Context, pa ret := _m.Called(_ca...) var r0 *ec2.UpdateSecurityGroupRuleDescriptionsEgressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.UpdateSecurityGroupRuleDescriptionsEgressInput, ...func(*ec2.Options)) (*ec2.UpdateSecurityGroupRuleDescriptionsEgressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.UpdateSecurityGroupRuleDescriptionsEgressInput, ...func(*ec2.Options)) *ec2.UpdateSecurityGroupRuleDescriptionsEgressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15604,7 +17165,6 @@ func (_m *EC2) UpdateSecurityGroupRuleDescriptionsEgress(ctx context.Context, pa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.UpdateSecurityGroupRuleDescriptionsEgressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15626,6 +17186,10 @@ func (_m *EC2) UpdateSecurityGroupRuleDescriptionsIngress(ctx context.Context, p ret := _m.Called(_ca...) var r0 *ec2.UpdateSecurityGroupRuleDescriptionsIngressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.UpdateSecurityGroupRuleDescriptionsIngressInput, ...func(*ec2.Options)) (*ec2.UpdateSecurityGroupRuleDescriptionsIngressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.UpdateSecurityGroupRuleDescriptionsIngressInput, ...func(*ec2.Options)) *ec2.UpdateSecurityGroupRuleDescriptionsIngressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15634,7 +17198,6 @@ func (_m *EC2) UpdateSecurityGroupRuleDescriptionsIngress(ctx context.Context, p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.UpdateSecurityGroupRuleDescriptionsIngressInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15656,6 +17219,10 @@ func (_m *EC2) WithdrawByoipCidr(ctx context.Context, params *ec2.WithdrawByoipC ret := _m.Called(_ca...) var r0 *ec2.WithdrawByoipCidrOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ec2.WithdrawByoipCidrInput, ...func(*ec2.Options)) (*ec2.WithdrawByoipCidrOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ec2.WithdrawByoipCidrInput, ...func(*ec2.Options)) *ec2.WithdrawByoipCidrOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -15664,7 +17231,6 @@ func (_m *EC2) WithdrawByoipCidr(ctx context.Context, params *ec2.WithdrawByoipC } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ec2.WithdrawByoipCidrInput, ...func(*ec2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -15673,3 +17239,17 @@ func (_m *EC2) WithdrawByoipCidr(ctx context.Context, params *ec2.WithdrawByoipC return r0, r1 } + +// NewEC2 creates a new instance of EC2. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewEC2(t interface { + mock.TestingT + Cleanup(func()) +}) *EC2 { + mock := &EC2{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/EKS.go b/pkg/eks/mocksv2/EKS.go index 74749f1598..ac9e59ea7f 100644 --- a/pkg/eks/mocksv2/EKS.go +++ b/pkg/eks/mocksv2/EKS.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *EKS) AssociateEncryptionConfig(ctx context.Context, params *eks.Associ ret := _m.Called(_ca...) var r0 *eks.AssociateEncryptionConfigOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.AssociateEncryptionConfigInput, ...func(*eks.Options)) (*eks.AssociateEncryptionConfigOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.AssociateEncryptionConfigInput, ...func(*eks.Options)) *eks.AssociateEncryptionConfigOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *EKS) AssociateEncryptionConfig(ctx context.Context, params *eks.Associ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.AssociateEncryptionConfigInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *EKS) AssociateIdentityProviderConfig(ctx context.Context, params *eks. ret := _m.Called(_ca...) var r0 *eks.AssociateIdentityProviderConfigOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.AssociateIdentityProviderConfigInput, ...func(*eks.Options)) (*eks.AssociateIdentityProviderConfigOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.AssociateIdentityProviderConfigInput, ...func(*eks.Options)) *eks.AssociateIdentityProviderConfigOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *EKS) AssociateIdentityProviderConfig(ctx context.Context, params *eks. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.AssociateIdentityProviderConfigInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *EKS) CreateAddon(ctx context.Context, params *eks.CreateAddonInput, op ret := _m.Called(_ca...) var r0 *eks.CreateAddonOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateAddonInput, ...func(*eks.Options)) (*eks.CreateAddonOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateAddonInput, ...func(*eks.Options)) *eks.CreateAddonOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *EKS) CreateAddon(ctx context.Context, params *eks.CreateAddonInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.CreateAddonInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *EKS) CreateCluster(ctx context.Context, params *eks.CreateClusterInput ret := _m.Called(_ca...) var r0 *eks.CreateClusterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateClusterInput, ...func(*eks.Options)) (*eks.CreateClusterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateClusterInput, ...func(*eks.Options)) *eks.CreateClusterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *EKS) CreateCluster(ctx context.Context, params *eks.CreateClusterInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.CreateClusterInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *EKS) CreateFargateProfile(ctx context.Context, params *eks.CreateFarga ret := _m.Called(_ca...) var r0 *eks.CreateFargateProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateFargateProfileInput, ...func(*eks.Options)) (*eks.CreateFargateProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateFargateProfileInput, ...func(*eks.Options)) *eks.CreateFargateProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *EKS) CreateFargateProfile(ctx context.Context, params *eks.CreateFarga } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.CreateFargateProfileInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *EKS) CreateNodegroup(ctx context.Context, params *eks.CreateNodegroupI ret := _m.Called(_ca...) var r0 *eks.CreateNodegroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateNodegroupInput, ...func(*eks.Options)) (*eks.CreateNodegroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.CreateNodegroupInput, ...func(*eks.Options)) *eks.CreateNodegroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *EKS) CreateNodegroup(ctx context.Context, params *eks.CreateNodegroupI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.CreateNodegroupInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *EKS) DeleteAddon(ctx context.Context, params *eks.DeleteAddonInput, op ret := _m.Called(_ca...) var r0 *eks.DeleteAddonOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteAddonInput, ...func(*eks.Options)) (*eks.DeleteAddonOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteAddonInput, ...func(*eks.Options)) *eks.DeleteAddonOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *EKS) DeleteAddon(ctx context.Context, params *eks.DeleteAddonInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DeleteAddonInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *EKS) DeleteCluster(ctx context.Context, params *eks.DeleteClusterInput ret := _m.Called(_ca...) var r0 *eks.DeleteClusterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteClusterInput, ...func(*eks.Options)) (*eks.DeleteClusterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteClusterInput, ...func(*eks.Options)) *eks.DeleteClusterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *EKS) DeleteCluster(ctx context.Context, params *eks.DeleteClusterInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DeleteClusterInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *EKS) DeleteFargateProfile(ctx context.Context, params *eks.DeleteFarga ret := _m.Called(_ca...) var r0 *eks.DeleteFargateProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteFargateProfileInput, ...func(*eks.Options)) (*eks.DeleteFargateProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteFargateProfileInput, ...func(*eks.Options)) *eks.DeleteFargateProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *EKS) DeleteFargateProfile(ctx context.Context, params *eks.DeleteFarga } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DeleteFargateProfileInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *EKS) DeleteNodegroup(ctx context.Context, params *eks.DeleteNodegroupI ret := _m.Called(_ca...) var r0 *eks.DeleteNodegroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteNodegroupInput, ...func(*eks.Options)) (*eks.DeleteNodegroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DeleteNodegroupInput, ...func(*eks.Options)) *eks.DeleteNodegroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *EKS) DeleteNodegroup(ctx context.Context, params *eks.DeleteNodegroupI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DeleteNodegroupInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *EKS) DeregisterCluster(ctx context.Context, params *eks.DeregisterClus ret := _m.Called(_ca...) var r0 *eks.DeregisterClusterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DeregisterClusterInput, ...func(*eks.Options)) (*eks.DeregisterClusterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DeregisterClusterInput, ...func(*eks.Options)) *eks.DeregisterClusterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *EKS) DeregisterCluster(ctx context.Context, params *eks.DeregisterClus } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DeregisterClusterInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *EKS) DescribeAddon(ctx context.Context, params *eks.DescribeAddonInput ret := _m.Called(_ca...) var r0 *eks.DescribeAddonOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeAddonInput, ...func(*eks.Options)) (*eks.DescribeAddonOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeAddonInput, ...func(*eks.Options)) *eks.DescribeAddonOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *EKS) DescribeAddon(ctx context.Context, params *eks.DescribeAddonInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeAddonInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *EKS) DescribeAddonConfiguration(ctx context.Context, params *eks.Descr ret := _m.Called(_ca...) var r0 *eks.DescribeAddonConfigurationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeAddonConfigurationInput, ...func(*eks.Options)) (*eks.DescribeAddonConfigurationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeAddonConfigurationInput, ...func(*eks.Options)) *eks.DescribeAddonConfigurationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *EKS) DescribeAddonConfiguration(ctx context.Context, params *eks.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeAddonConfigurationInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *EKS) DescribeAddonVersions(ctx context.Context, params *eks.DescribeAd ret := _m.Called(_ca...) var r0 *eks.DescribeAddonVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeAddonVersionsInput, ...func(*eks.Options)) (*eks.DescribeAddonVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeAddonVersionsInput, ...func(*eks.Options)) *eks.DescribeAddonVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *EKS) DescribeAddonVersions(ctx context.Context, params *eks.DescribeAd } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeAddonVersionsInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *EKS) DescribeCluster(ctx context.Context, params *eks.DescribeClusterI ret := _m.Called(_ca...) var r0 *eks.DescribeClusterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeClusterInput, ...func(*eks.Options)) (*eks.DescribeClusterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeClusterInput, ...func(*eks.Options)) *eks.DescribeClusterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *EKS) DescribeCluster(ctx context.Context, params *eks.DescribeClusterI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeClusterInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *EKS) DescribeFargateProfile(ctx context.Context, params *eks.DescribeF ret := _m.Called(_ca...) var r0 *eks.DescribeFargateProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeFargateProfileInput, ...func(*eks.Options)) (*eks.DescribeFargateProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeFargateProfileInput, ...func(*eks.Options)) *eks.DescribeFargateProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *EKS) DescribeFargateProfile(ctx context.Context, params *eks.DescribeF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeFargateProfileInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *EKS) DescribeIdentityProviderConfig(ctx context.Context, params *eks.D ret := _m.Called(_ca...) var r0 *eks.DescribeIdentityProviderConfigOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeIdentityProviderConfigInput, ...func(*eks.Options)) (*eks.DescribeIdentityProviderConfigOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeIdentityProviderConfigInput, ...func(*eks.Options)) *eks.DescribeIdentityProviderConfigOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *EKS) DescribeIdentityProviderConfig(ctx context.Context, params *eks.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeIdentityProviderConfigInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *EKS) DescribeNodegroup(ctx context.Context, params *eks.DescribeNodegr ret := _m.Called(_ca...) var r0 *eks.DescribeNodegroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeNodegroupInput, ...func(*eks.Options)) (*eks.DescribeNodegroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeNodegroupInput, ...func(*eks.Options)) *eks.DescribeNodegroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *EKS) DescribeNodegroup(ctx context.Context, params *eks.DescribeNodegr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeNodegroupInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *EKS) DescribeUpdate(ctx context.Context, params *eks.DescribeUpdateInp ret := _m.Called(_ca...) var r0 *eks.DescribeUpdateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeUpdateInput, ...func(*eks.Options)) (*eks.DescribeUpdateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DescribeUpdateInput, ...func(*eks.Options)) *eks.DescribeUpdateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *EKS) DescribeUpdate(ctx context.Context, params *eks.DescribeUpdateInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DescribeUpdateInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *EKS) DisassociateIdentityProviderConfig(ctx context.Context, params *e ret := _m.Called(_ca...) var r0 *eks.DisassociateIdentityProviderConfigOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.DisassociateIdentityProviderConfigInput, ...func(*eks.Options)) (*eks.DisassociateIdentityProviderConfigOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.DisassociateIdentityProviderConfigInput, ...func(*eks.Options)) *eks.DisassociateIdentityProviderConfigOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *EKS) DisassociateIdentityProviderConfig(ctx context.Context, params *e } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.DisassociateIdentityProviderConfigInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *EKS) ListAddons(ctx context.Context, params *eks.ListAddonsInput, optF ret := _m.Called(_ca...) var r0 *eks.ListAddonsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListAddonsInput, ...func(*eks.Options)) (*eks.ListAddonsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListAddonsInput, ...func(*eks.Options)) *eks.ListAddonsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *EKS) ListAddons(ctx context.Context, params *eks.ListAddonsInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListAddonsInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *EKS) ListClusters(ctx context.Context, params *eks.ListClustersInput, ret := _m.Called(_ca...) var r0 *eks.ListClustersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListClustersInput, ...func(*eks.Options)) (*eks.ListClustersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListClustersInput, ...func(*eks.Options)) *eks.ListClustersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *EKS) ListClusters(ctx context.Context, params *eks.ListClustersInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListClustersInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *EKS) ListFargateProfiles(ctx context.Context, params *eks.ListFargateP ret := _m.Called(_ca...) var r0 *eks.ListFargateProfilesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListFargateProfilesInput, ...func(*eks.Options)) (*eks.ListFargateProfilesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListFargateProfilesInput, ...func(*eks.Options)) *eks.ListFargateProfilesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *EKS) ListFargateProfiles(ctx context.Context, params *eks.ListFargateP } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListFargateProfilesInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *EKS) ListIdentityProviderConfigs(ctx context.Context, params *eks.List ret := _m.Called(_ca...) var r0 *eks.ListIdentityProviderConfigsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListIdentityProviderConfigsInput, ...func(*eks.Options)) (*eks.ListIdentityProviderConfigsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListIdentityProviderConfigsInput, ...func(*eks.Options)) *eks.ListIdentityProviderConfigsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *EKS) ListIdentityProviderConfigs(ctx context.Context, params *eks.List } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListIdentityProviderConfigsInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *EKS) ListNodegroups(ctx context.Context, params *eks.ListNodegroupsInp ret := _m.Called(_ca...) var r0 *eks.ListNodegroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListNodegroupsInput, ...func(*eks.Options)) (*eks.ListNodegroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListNodegroupsInput, ...func(*eks.Options)) *eks.ListNodegroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *EKS) ListNodegroups(ctx context.Context, params *eks.ListNodegroupsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListNodegroupsInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *EKS) ListTagsForResource(ctx context.Context, params *eks.ListTagsForR ret := _m.Called(_ca...) var r0 *eks.ListTagsForResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListTagsForResourceInput, ...func(*eks.Options)) (*eks.ListTagsForResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListTagsForResourceInput, ...func(*eks.Options)) *eks.ListTagsForResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *EKS) ListTagsForResource(ctx context.Context, params *eks.ListTagsForR } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListTagsForResourceInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -806,6 +884,10 @@ func (_m *EKS) ListUpdates(ctx context.Context, params *eks.ListUpdatesInput, op ret := _m.Called(_ca...) var r0 *eks.ListUpdatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.ListUpdatesInput, ...func(*eks.Options)) (*eks.ListUpdatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.ListUpdatesInput, ...func(*eks.Options)) *eks.ListUpdatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -814,7 +896,6 @@ func (_m *EKS) ListUpdates(ctx context.Context, params *eks.ListUpdatesInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.ListUpdatesInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -836,6 +917,10 @@ func (_m *EKS) RegisterCluster(ctx context.Context, params *eks.RegisterClusterI ret := _m.Called(_ca...) var r0 *eks.RegisterClusterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.RegisterClusterInput, ...func(*eks.Options)) (*eks.RegisterClusterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.RegisterClusterInput, ...func(*eks.Options)) *eks.RegisterClusterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -844,7 +929,6 @@ func (_m *EKS) RegisterCluster(ctx context.Context, params *eks.RegisterClusterI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.RegisterClusterInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -866,6 +950,10 @@ func (_m *EKS) TagResource(ctx context.Context, params *eks.TagResourceInput, op ret := _m.Called(_ca...) var r0 *eks.TagResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.TagResourceInput, ...func(*eks.Options)) (*eks.TagResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.TagResourceInput, ...func(*eks.Options)) *eks.TagResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -874,7 +962,6 @@ func (_m *EKS) TagResource(ctx context.Context, params *eks.TagResourceInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.TagResourceInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -896,6 +983,10 @@ func (_m *EKS) UntagResource(ctx context.Context, params *eks.UntagResourceInput ret := _m.Called(_ca...) var r0 *eks.UntagResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UntagResourceInput, ...func(*eks.Options)) (*eks.UntagResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.UntagResourceInput, ...func(*eks.Options)) *eks.UntagResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -904,7 +995,6 @@ func (_m *EKS) UntagResource(ctx context.Context, params *eks.UntagResourceInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.UntagResourceInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -926,6 +1016,10 @@ func (_m *EKS) UpdateAddon(ctx context.Context, params *eks.UpdateAddonInput, op ret := _m.Called(_ca...) var r0 *eks.UpdateAddonOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateAddonInput, ...func(*eks.Options)) (*eks.UpdateAddonOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateAddonInput, ...func(*eks.Options)) *eks.UpdateAddonOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -934,7 +1028,6 @@ func (_m *EKS) UpdateAddon(ctx context.Context, params *eks.UpdateAddonInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.UpdateAddonInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -956,6 +1049,10 @@ func (_m *EKS) UpdateClusterConfig(ctx context.Context, params *eks.UpdateCluste ret := _m.Called(_ca...) var r0 *eks.UpdateClusterConfigOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateClusterConfigInput, ...func(*eks.Options)) (*eks.UpdateClusterConfigOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateClusterConfigInput, ...func(*eks.Options)) *eks.UpdateClusterConfigOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -964,7 +1061,6 @@ func (_m *EKS) UpdateClusterConfig(ctx context.Context, params *eks.UpdateCluste } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.UpdateClusterConfigInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -986,6 +1082,10 @@ func (_m *EKS) UpdateClusterVersion(ctx context.Context, params *eks.UpdateClust ret := _m.Called(_ca...) var r0 *eks.UpdateClusterVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateClusterVersionInput, ...func(*eks.Options)) (*eks.UpdateClusterVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateClusterVersionInput, ...func(*eks.Options)) *eks.UpdateClusterVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -994,7 +1094,6 @@ func (_m *EKS) UpdateClusterVersion(ctx context.Context, params *eks.UpdateClust } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.UpdateClusterVersionInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1016,6 +1115,10 @@ func (_m *EKS) UpdateNodegroupConfig(ctx context.Context, params *eks.UpdateNode ret := _m.Called(_ca...) var r0 *eks.UpdateNodegroupConfigOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateNodegroupConfigInput, ...func(*eks.Options)) (*eks.UpdateNodegroupConfigOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateNodegroupConfigInput, ...func(*eks.Options)) *eks.UpdateNodegroupConfigOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1024,7 +1127,6 @@ func (_m *EKS) UpdateNodegroupConfig(ctx context.Context, params *eks.UpdateNode } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.UpdateNodegroupConfigInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1046,6 +1148,10 @@ func (_m *EKS) UpdateNodegroupVersion(ctx context.Context, params *eks.UpdateNod ret := _m.Called(_ca...) var r0 *eks.UpdateNodegroupVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateNodegroupVersionInput, ...func(*eks.Options)) (*eks.UpdateNodegroupVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *eks.UpdateNodegroupVersionInput, ...func(*eks.Options)) *eks.UpdateNodegroupVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1054,7 +1160,6 @@ func (_m *EKS) UpdateNodegroupVersion(ctx context.Context, params *eks.UpdateNod } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *eks.UpdateNodegroupVersionInput, ...func(*eks.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1063,3 +1168,17 @@ func (_m *EKS) UpdateNodegroupVersion(ctx context.Context, params *eks.UpdateNod return r0, r1 } + +// NewEKS creates a new instance of EKS. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewEKS(t interface { + mock.TestingT + Cleanup(func()) +}) *EKS { + mock := &EKS{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/ELB.go b/pkg/eks/mocksv2/ELB.go index a62831a194..83d8a2da97 100644 --- a/pkg/eks/mocksv2/ELB.go +++ b/pkg/eks/mocksv2/ELB.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *ELB) AddTags(ctx context.Context, params *elasticloadbalancing.AddTags ret := _m.Called(_ca...) var r0 *elasticloadbalancing.AddTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.AddTagsInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.AddTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.AddTagsInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.AddTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *ELB) AddTags(ctx context.Context, params *elasticloadbalancing.AddTags } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.AddTagsInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *ELB) ApplySecurityGroupsToLoadBalancer(ctx context.Context, params *el ret := _m.Called(_ca...) var r0 *elasticloadbalancing.ApplySecurityGroupsToLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.ApplySecurityGroupsToLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.ApplySecurityGroupsToLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.ApplySecurityGroupsToLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.ApplySecurityGroupsToLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *ELB) ApplySecurityGroupsToLoadBalancer(ctx context.Context, params *el } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.ApplySecurityGroupsToLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *ELB) AttachLoadBalancerToSubnets(ctx context.Context, params *elasticl ret := _m.Called(_ca...) var r0 *elasticloadbalancing.AttachLoadBalancerToSubnetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.AttachLoadBalancerToSubnetsInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.AttachLoadBalancerToSubnetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.AttachLoadBalancerToSubnetsInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.AttachLoadBalancerToSubnetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *ELB) AttachLoadBalancerToSubnets(ctx context.Context, params *elasticl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.AttachLoadBalancerToSubnetsInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *ELB) ConfigureHealthCheck(ctx context.Context, params *elasticloadbala ret := _m.Called(_ca...) var r0 *elasticloadbalancing.ConfigureHealthCheckOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.ConfigureHealthCheckInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.ConfigureHealthCheckOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.ConfigureHealthCheckInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.ConfigureHealthCheckOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *ELB) ConfigureHealthCheck(ctx context.Context, params *elasticloadbala } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.ConfigureHealthCheckInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *ELB) CreateAppCookieStickinessPolicy(ctx context.Context, params *elas ret := _m.Called(_ca...) var r0 *elasticloadbalancing.CreateAppCookieStickinessPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateAppCookieStickinessPolicyInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.CreateAppCookieStickinessPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateAppCookieStickinessPolicyInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.CreateAppCookieStickinessPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *ELB) CreateAppCookieStickinessPolicy(ctx context.Context, params *elas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.CreateAppCookieStickinessPolicyInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *ELB) CreateLBCookieStickinessPolicy(ctx context.Context, params *elast ret := _m.Called(_ca...) var r0 *elasticloadbalancing.CreateLBCookieStickinessPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLBCookieStickinessPolicyInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.CreateLBCookieStickinessPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLBCookieStickinessPolicyInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.CreateLBCookieStickinessPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *ELB) CreateLBCookieStickinessPolicy(ctx context.Context, params *elast } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.CreateLBCookieStickinessPolicyInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *ELB) CreateLoadBalancer(ctx context.Context, params *elasticloadbalanc ret := _m.Called(_ca...) var r0 *elasticloadbalancing.CreateLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.CreateLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.CreateLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *ELB) CreateLoadBalancer(ctx context.Context, params *elasticloadbalanc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *ELB) CreateLoadBalancerListeners(ctx context.Context, params *elasticl ret := _m.Called(_ca...) var r0 *elasticloadbalancing.CreateLoadBalancerListenersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerListenersInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.CreateLoadBalancerListenersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerListenersInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.CreateLoadBalancerListenersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *ELB) CreateLoadBalancerListeners(ctx context.Context, params *elasticl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerListenersInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *ELB) CreateLoadBalancerPolicy(ctx context.Context, params *elasticload ret := _m.Called(_ca...) var r0 *elasticloadbalancing.CreateLoadBalancerPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerPolicyInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.CreateLoadBalancerPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerPolicyInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.CreateLoadBalancerPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *ELB) CreateLoadBalancerPolicy(ctx context.Context, params *elasticload } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.CreateLoadBalancerPolicyInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *ELB) DeleteLoadBalancer(ctx context.Context, params *elasticloadbalanc ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DeleteLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DeleteLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DeleteLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *ELB) DeleteLoadBalancer(ctx context.Context, params *elasticloadbalanc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *ELB) DeleteLoadBalancerListeners(ctx context.Context, params *elasticl ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DeleteLoadBalancerListenersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerListenersInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DeleteLoadBalancerListenersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerListenersInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DeleteLoadBalancerListenersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *ELB) DeleteLoadBalancerListeners(ctx context.Context, params *elasticl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerListenersInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *ELB) DeleteLoadBalancerPolicy(ctx context.Context, params *elasticload ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DeleteLoadBalancerPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerPolicyInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DeleteLoadBalancerPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerPolicyInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DeleteLoadBalancerPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *ELB) DeleteLoadBalancerPolicy(ctx context.Context, params *elasticload } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DeleteLoadBalancerPolicyInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *ELB) DeregisterInstancesFromLoadBalancer(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DeregisterInstancesFromLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeregisterInstancesFromLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DeregisterInstancesFromLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DeregisterInstancesFromLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DeregisterInstancesFromLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *ELB) DeregisterInstancesFromLoadBalancer(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DeregisterInstancesFromLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *ELB) DescribeAccountLimits(ctx context.Context, params *elasticloadbal ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeAccountLimitsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeAccountLimitsInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeAccountLimitsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeAccountLimitsInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeAccountLimitsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *ELB) DescribeAccountLimits(ctx context.Context, params *elasticloadbal } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeAccountLimitsInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *ELB) DescribeInstanceHealth(ctx context.Context, params *elasticloadba ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeInstanceHealthOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeInstanceHealthInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeInstanceHealthOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeInstanceHealthInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeInstanceHealthOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *ELB) DescribeInstanceHealth(ctx context.Context, params *elasticloadba } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeInstanceHealthInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *ELB) DescribeLoadBalancerAttributes(ctx context.Context, params *elast ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeLoadBalancerAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerAttributesInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeLoadBalancerAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerAttributesInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeLoadBalancerAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *ELB) DescribeLoadBalancerAttributes(ctx context.Context, params *elast } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerAttributesInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *ELB) DescribeLoadBalancerPolicies(ctx context.Context, params *elastic ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeLoadBalancerPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerPoliciesInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeLoadBalancerPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerPoliciesInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeLoadBalancerPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *ELB) DescribeLoadBalancerPolicies(ctx context.Context, params *elastic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerPoliciesInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *ELB) DescribeLoadBalancerPolicyTypes(ctx context.Context, params *elas ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeLoadBalancerPolicyTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerPolicyTypesInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeLoadBalancerPolicyTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerPolicyTypesInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeLoadBalancerPolicyTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *ELB) DescribeLoadBalancerPolicyTypes(ctx context.Context, params *elas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancerPolicyTypesInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *ELB) DescribeLoadBalancers(ctx context.Context, params *elasticloadbal ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeLoadBalancersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancersInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeLoadBalancersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancersInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeLoadBalancersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *ELB) DescribeLoadBalancers(ctx context.Context, params *elasticloadbal } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeLoadBalancersInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *ELB) DescribeTags(ctx context.Context, params *elasticloadbalancing.De ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DescribeTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeTagsInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DescribeTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DescribeTagsInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DescribeTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *ELB) DescribeTags(ctx context.Context, params *elasticloadbalancing.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DescribeTagsInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *ELB) DetachLoadBalancerFromSubnets(ctx context.Context, params *elasti ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DetachLoadBalancerFromSubnetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DetachLoadBalancerFromSubnetsInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DetachLoadBalancerFromSubnetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DetachLoadBalancerFromSubnetsInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DetachLoadBalancerFromSubnetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *ELB) DetachLoadBalancerFromSubnets(ctx context.Context, params *elasti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DetachLoadBalancerFromSubnetsInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *ELB) DisableAvailabilityZonesForLoadBalancer(ctx context.Context, para ret := _m.Called(_ca...) var r0 *elasticloadbalancing.DisableAvailabilityZonesForLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DisableAvailabilityZonesForLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.DisableAvailabilityZonesForLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.DisableAvailabilityZonesForLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.DisableAvailabilityZonesForLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *ELB) DisableAvailabilityZonesForLoadBalancer(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.DisableAvailabilityZonesForLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *ELB) EnableAvailabilityZonesForLoadBalancer(ctx context.Context, param ret := _m.Called(_ca...) var r0 *elasticloadbalancing.EnableAvailabilityZonesForLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.EnableAvailabilityZonesForLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.EnableAvailabilityZonesForLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.EnableAvailabilityZonesForLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.EnableAvailabilityZonesForLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *ELB) EnableAvailabilityZonesForLoadBalancer(ctx context.Context, param } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.EnableAvailabilityZonesForLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *ELB) ModifyLoadBalancerAttributes(ctx context.Context, params *elastic ret := _m.Called(_ca...) var r0 *elasticloadbalancing.ModifyLoadBalancerAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.ModifyLoadBalancerAttributesInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.ModifyLoadBalancerAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.ModifyLoadBalancerAttributesInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.ModifyLoadBalancerAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *ELB) ModifyLoadBalancerAttributes(ctx context.Context, params *elastic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.ModifyLoadBalancerAttributesInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *ELB) RegisterInstancesWithLoadBalancer(ctx context.Context, params *el ret := _m.Called(_ca...) var r0 *elasticloadbalancing.RegisterInstancesWithLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.RegisterInstancesWithLoadBalancerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.RegisterInstancesWithLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.RegisterInstancesWithLoadBalancerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.RegisterInstancesWithLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *ELB) RegisterInstancesWithLoadBalancer(ctx context.Context, params *el } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.RegisterInstancesWithLoadBalancerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *ELB) RemoveTags(ctx context.Context, params *elasticloadbalancing.Remo ret := _m.Called(_ca...) var r0 *elasticloadbalancing.RemoveTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.RemoveTagsInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.RemoveTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.RemoveTagsInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.RemoveTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *ELB) RemoveTags(ctx context.Context, params *elasticloadbalancing.Remo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.RemoveTagsInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -806,6 +884,10 @@ func (_m *ELB) SetLoadBalancerListenerSSLCertificate(ctx context.Context, params ret := _m.Called(_ca...) var r0 *elasticloadbalancing.SetLoadBalancerListenerSSLCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.SetLoadBalancerListenerSSLCertificateInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.SetLoadBalancerListenerSSLCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.SetLoadBalancerListenerSSLCertificateInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.SetLoadBalancerListenerSSLCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -814,7 +896,6 @@ func (_m *ELB) SetLoadBalancerListenerSSLCertificate(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.SetLoadBalancerListenerSSLCertificateInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -836,6 +917,10 @@ func (_m *ELB) SetLoadBalancerPoliciesForBackendServer(ctx context.Context, para ret := _m.Called(_ca...) var r0 *elasticloadbalancing.SetLoadBalancerPoliciesForBackendServerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.SetLoadBalancerPoliciesForBackendServerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.SetLoadBalancerPoliciesForBackendServerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.SetLoadBalancerPoliciesForBackendServerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.SetLoadBalancerPoliciesForBackendServerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -844,7 +929,6 @@ func (_m *ELB) SetLoadBalancerPoliciesForBackendServer(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.SetLoadBalancerPoliciesForBackendServerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -866,6 +950,10 @@ func (_m *ELB) SetLoadBalancerPoliciesOfListener(ctx context.Context, params *el ret := _m.Called(_ca...) var r0 *elasticloadbalancing.SetLoadBalancerPoliciesOfListenerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.SetLoadBalancerPoliciesOfListenerInput, ...func(*elasticloadbalancing.Options)) (*elasticloadbalancing.SetLoadBalancerPoliciesOfListenerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancing.SetLoadBalancerPoliciesOfListenerInput, ...func(*elasticloadbalancing.Options)) *elasticloadbalancing.SetLoadBalancerPoliciesOfListenerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -874,7 +962,6 @@ func (_m *ELB) SetLoadBalancerPoliciesOfListener(ctx context.Context, params *el } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancing.SetLoadBalancerPoliciesOfListenerInput, ...func(*elasticloadbalancing.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -883,3 +970,17 @@ func (_m *ELB) SetLoadBalancerPoliciesOfListener(ctx context.Context, params *el return r0, r1 } + +// NewELB creates a new instance of ELB. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewELB(t interface { + mock.TestingT + Cleanup(func()) +}) *ELB { + mock := &ELB{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/ELBV2.go b/pkg/eks/mocksv2/ELBV2.go index 0b85634226..02fa44db67 100644 --- a/pkg/eks/mocksv2/ELBV2.go +++ b/pkg/eks/mocksv2/ELBV2.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *ELBV2) AddListenerCertificates(ctx context.Context, params *elasticloa ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.AddListenerCertificatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.AddListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.AddListenerCertificatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.AddListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.AddListenerCertificatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *ELBV2) AddListenerCertificates(ctx context.Context, params *elasticloa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.AddListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *ELBV2) AddTags(ctx context.Context, params *elasticloadbalancingv2.Add ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.AddTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.AddTagsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.AddTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.AddTagsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.AddTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *ELBV2) AddTags(ctx context.Context, params *elasticloadbalancingv2.Add } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.AddTagsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *ELBV2) CreateListener(ctx context.Context, params *elasticloadbalancin ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.CreateListenerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateListenerInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.CreateListenerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateListenerInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.CreateListenerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *ELBV2) CreateListener(ctx context.Context, params *elasticloadbalancin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.CreateListenerInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *ELBV2) CreateLoadBalancer(ctx context.Context, params *elasticloadbala ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.CreateLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateLoadBalancerInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.CreateLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateLoadBalancerInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.CreateLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *ELBV2) CreateLoadBalancer(ctx context.Context, params *elasticloadbala } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.CreateLoadBalancerInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *ELBV2) CreateRule(ctx context.Context, params *elasticloadbalancingv2. ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.CreateRuleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateRuleInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.CreateRuleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateRuleInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.CreateRuleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *ELBV2) CreateRule(ctx context.Context, params *elasticloadbalancingv2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.CreateRuleInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *ELBV2) CreateTargetGroup(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.CreateTargetGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.CreateTargetGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.CreateTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.CreateTargetGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *ELBV2) CreateTargetGroup(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.CreateTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *ELBV2) DeleteListener(ctx context.Context, params *elasticloadbalancin ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DeleteListenerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteListenerInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DeleteListenerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteListenerInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DeleteListenerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *ELBV2) DeleteListener(ctx context.Context, params *elasticloadbalancin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DeleteListenerInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *ELBV2) DeleteLoadBalancer(ctx context.Context, params *elasticloadbala ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DeleteLoadBalancerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteLoadBalancerInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DeleteLoadBalancerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteLoadBalancerInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DeleteLoadBalancerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *ELBV2) DeleteLoadBalancer(ctx context.Context, params *elasticloadbala } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DeleteLoadBalancerInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *ELBV2) DeleteRule(ctx context.Context, params *elasticloadbalancingv2. ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DeleteRuleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteRuleInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DeleteRuleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteRuleInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DeleteRuleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *ELBV2) DeleteRule(ctx context.Context, params *elasticloadbalancingv2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DeleteRuleInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *ELBV2) DeleteTargetGroup(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DeleteTargetGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DeleteTargetGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeleteTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DeleteTargetGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *ELBV2) DeleteTargetGroup(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DeleteTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *ELBV2) DeregisterTargets(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DeregisterTargetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeregisterTargetsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DeregisterTargetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DeregisterTargetsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DeregisterTargetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *ELBV2) DeregisterTargets(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DeregisterTargetsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *ELBV2) DescribeAccountLimits(ctx context.Context, params *elasticloadb ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeAccountLimitsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeAccountLimitsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeAccountLimitsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeAccountLimitsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeAccountLimitsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *ELBV2) DescribeAccountLimits(ctx context.Context, params *elasticloadb } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeAccountLimitsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *ELBV2) DescribeListenerCertificates(ctx context.Context, params *elast ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeListenerCertificatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeListenerCertificatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeListenerCertificatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *ELBV2) DescribeListenerCertificates(ctx context.Context, params *elast } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *ELBV2) DescribeListeners(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeListenersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeListenersInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeListenersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeListenersInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeListenersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *ELBV2) DescribeListeners(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeListenersInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *ELBV2) DescribeLoadBalancerAttributes(ctx context.Context, params *ela ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeLoadBalancerAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancerAttributesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeLoadBalancerAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancerAttributesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeLoadBalancerAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *ELBV2) DescribeLoadBalancerAttributes(ctx context.Context, params *ela } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancerAttributesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *ELBV2) DescribeLoadBalancers(ctx context.Context, params *elasticloadb ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeLoadBalancersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancersInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeLoadBalancersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancersInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeLoadBalancersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *ELBV2) DescribeLoadBalancers(ctx context.Context, params *elasticloadb } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeLoadBalancersInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *ELBV2) DescribeRules(ctx context.Context, params *elasticloadbalancing ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeRulesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeRulesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeRulesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeRulesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeRulesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *ELBV2) DescribeRules(ctx context.Context, params *elasticloadbalancing } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeRulesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *ELBV2) DescribeSSLPolicies(ctx context.Context, params *elasticloadbal ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeSSLPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeSSLPoliciesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeSSLPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeSSLPoliciesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeSSLPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *ELBV2) DescribeSSLPolicies(ctx context.Context, params *elasticloadbal } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeSSLPoliciesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *ELBV2) DescribeTags(ctx context.Context, params *elasticloadbalancingv ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTagsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTagsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *ELBV2) DescribeTags(ctx context.Context, params *elasticloadbalancingv } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeTagsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *ELBV2) DescribeTargetGroupAttributes(ctx context.Context, params *elas ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeTargetGroupAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupAttributesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTargetGroupAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupAttributesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeTargetGroupAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *ELBV2) DescribeTargetGroupAttributes(ctx context.Context, params *elas } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupAttributesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *ELBV2) DescribeTargetGroups(ctx context.Context, params *elasticloadba ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeTargetGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTargetGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeTargetGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *ELBV2) DescribeTargetGroups(ctx context.Context, params *elasticloadba } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeTargetGroupsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *ELBV2) DescribeTargetHealth(ctx context.Context, params *elasticloadba ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.DescribeTargetHealthOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetHealthInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.DescribeTargetHealthOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.DescribeTargetHealthInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.DescribeTargetHealthOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *ELBV2) DescribeTargetHealth(ctx context.Context, params *elasticloadba } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.DescribeTargetHealthInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *ELBV2) ModifyListener(ctx context.Context, params *elasticloadbalancin ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.ModifyListenerOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyListenerInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyListenerOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyListenerInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.ModifyListenerOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *ELBV2) ModifyListener(ctx context.Context, params *elasticloadbalancin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.ModifyListenerInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *ELBV2) ModifyLoadBalancerAttributes(ctx context.Context, params *elast ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.ModifyLoadBalancerAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyLoadBalancerAttributesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyLoadBalancerAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyLoadBalancerAttributesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.ModifyLoadBalancerAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *ELBV2) ModifyLoadBalancerAttributes(ctx context.Context, params *elast } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.ModifyLoadBalancerAttributesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *ELBV2) ModifyRule(ctx context.Context, params *elasticloadbalancingv2. ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.ModifyRuleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyRuleInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyRuleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyRuleInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.ModifyRuleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *ELBV2) ModifyRule(ctx context.Context, params *elasticloadbalancingv2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.ModifyRuleInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *ELBV2) ModifyTargetGroup(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.ModifyTargetGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyTargetGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.ModifyTargetGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *ELBV2) ModifyTargetGroup(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.ModifyTargetGroupInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -806,6 +884,10 @@ func (_m *ELBV2) ModifyTargetGroupAttributes(ctx context.Context, params *elasti ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.ModifyTargetGroupAttributesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyTargetGroupAttributesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyTargetGroupAttributesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyTargetGroupAttributesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.ModifyTargetGroupAttributesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -814,7 +896,6 @@ func (_m *ELBV2) ModifyTargetGroupAttributes(ctx context.Context, params *elasti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.ModifyTargetGroupAttributesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -836,6 +917,10 @@ func (_m *ELBV2) RegisterTargets(ctx context.Context, params *elasticloadbalanci ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.RegisterTargetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.RegisterTargetsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.RegisterTargetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.RegisterTargetsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.RegisterTargetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -844,7 +929,6 @@ func (_m *ELBV2) RegisterTargets(ctx context.Context, params *elasticloadbalanci } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.RegisterTargetsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -866,6 +950,10 @@ func (_m *ELBV2) RemoveListenerCertificates(ctx context.Context, params *elastic ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.RemoveListenerCertificatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.RemoveListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.RemoveListenerCertificatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.RemoveListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.RemoveListenerCertificatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -874,7 +962,6 @@ func (_m *ELBV2) RemoveListenerCertificates(ctx context.Context, params *elastic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.RemoveListenerCertificatesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -896,6 +983,10 @@ func (_m *ELBV2) RemoveTags(ctx context.Context, params *elasticloadbalancingv2. ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.RemoveTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.RemoveTagsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.RemoveTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.RemoveTagsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.RemoveTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -904,7 +995,6 @@ func (_m *ELBV2) RemoveTags(ctx context.Context, params *elasticloadbalancingv2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.RemoveTagsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -926,6 +1016,10 @@ func (_m *ELBV2) SetIpAddressType(ctx context.Context, params *elasticloadbalanc ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.SetIpAddressTypeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetIpAddressTypeInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.SetIpAddressTypeOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetIpAddressTypeInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.SetIpAddressTypeOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -934,7 +1028,6 @@ func (_m *ELBV2) SetIpAddressType(ctx context.Context, params *elasticloadbalanc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.SetIpAddressTypeInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -956,6 +1049,10 @@ func (_m *ELBV2) SetRulePriorities(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.SetRulePrioritiesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetRulePrioritiesInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.SetRulePrioritiesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetRulePrioritiesInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.SetRulePrioritiesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -964,7 +1061,6 @@ func (_m *ELBV2) SetRulePriorities(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.SetRulePrioritiesInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -986,6 +1082,10 @@ func (_m *ELBV2) SetSecurityGroups(ctx context.Context, params *elasticloadbalan ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.SetSecurityGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetSecurityGroupsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.SetSecurityGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetSecurityGroupsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.SetSecurityGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -994,7 +1094,6 @@ func (_m *ELBV2) SetSecurityGroups(ctx context.Context, params *elasticloadbalan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.SetSecurityGroupsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1016,6 +1115,10 @@ func (_m *ELBV2) SetSubnets(ctx context.Context, params *elasticloadbalancingv2. ret := _m.Called(_ca...) var r0 *elasticloadbalancingv2.SetSubnetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetSubnetsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.SetSubnetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.SetSubnetsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.SetSubnetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1024,7 +1127,6 @@ func (_m *ELBV2) SetSubnets(ctx context.Context, params *elasticloadbalancingv2. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.SetSubnetsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1033,3 +1135,17 @@ func (_m *ELBV2) SetSubnets(ctx context.Context, params *elasticloadbalancingv2. return r0, r1 } + +// NewELBV2 creates a new instance of ELBV2. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewELBV2(t interface { + mock.TestingT + Cleanup(func()) +}) *ELBV2 { + mock := &ELBV2{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/IAM.go b/pkg/eks/mocksv2/IAM.go index 1a61bd93e6..d335605596 100644 --- a/pkg/eks/mocksv2/IAM.go +++ b/pkg/eks/mocksv2/IAM.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *IAM) AddClientIDToOpenIDConnectProvider(ctx context.Context, params *i ret := _m.Called(_ca...) var r0 *iam.AddClientIDToOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.AddClientIDToOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.AddClientIDToOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.AddClientIDToOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.AddClientIDToOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *IAM) AddClientIDToOpenIDConnectProvider(ctx context.Context, params *i } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.AddClientIDToOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *IAM) AddRoleToInstanceProfile(ctx context.Context, params *iam.AddRole ret := _m.Called(_ca...) var r0 *iam.AddRoleToInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.AddRoleToInstanceProfileInput, ...func(*iam.Options)) (*iam.AddRoleToInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.AddRoleToInstanceProfileInput, ...func(*iam.Options)) *iam.AddRoleToInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *IAM) AddRoleToInstanceProfile(ctx context.Context, params *iam.AddRole } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.AddRoleToInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *IAM) AddUserToGroup(ctx context.Context, params *iam.AddUserToGroupInp ret := _m.Called(_ca...) var r0 *iam.AddUserToGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.AddUserToGroupInput, ...func(*iam.Options)) (*iam.AddUserToGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.AddUserToGroupInput, ...func(*iam.Options)) *iam.AddUserToGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *IAM) AddUserToGroup(ctx context.Context, params *iam.AddUserToGroupInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.AddUserToGroupInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *IAM) AttachGroupPolicy(ctx context.Context, params *iam.AttachGroupPol ret := _m.Called(_ca...) var r0 *iam.AttachGroupPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.AttachGroupPolicyInput, ...func(*iam.Options)) (*iam.AttachGroupPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.AttachGroupPolicyInput, ...func(*iam.Options)) *iam.AttachGroupPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *IAM) AttachGroupPolicy(ctx context.Context, params *iam.AttachGroupPol } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.AttachGroupPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *IAM) AttachRolePolicy(ctx context.Context, params *iam.AttachRolePolic ret := _m.Called(_ca...) var r0 *iam.AttachRolePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.AttachRolePolicyInput, ...func(*iam.Options)) (*iam.AttachRolePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.AttachRolePolicyInput, ...func(*iam.Options)) *iam.AttachRolePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *IAM) AttachRolePolicy(ctx context.Context, params *iam.AttachRolePolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.AttachRolePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *IAM) AttachUserPolicy(ctx context.Context, params *iam.AttachUserPolic ret := _m.Called(_ca...) var r0 *iam.AttachUserPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.AttachUserPolicyInput, ...func(*iam.Options)) (*iam.AttachUserPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.AttachUserPolicyInput, ...func(*iam.Options)) *iam.AttachUserPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *IAM) AttachUserPolicy(ctx context.Context, params *iam.AttachUserPolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.AttachUserPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *IAM) ChangePassword(ctx context.Context, params *iam.ChangePasswordInp ret := _m.Called(_ca...) var r0 *iam.ChangePasswordOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ChangePasswordInput, ...func(*iam.Options)) (*iam.ChangePasswordOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ChangePasswordInput, ...func(*iam.Options)) *iam.ChangePasswordOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *IAM) ChangePassword(ctx context.Context, params *iam.ChangePasswordInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ChangePasswordInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *IAM) CreateAccessKey(ctx context.Context, params *iam.CreateAccessKeyI ret := _m.Called(_ca...) var r0 *iam.CreateAccessKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateAccessKeyInput, ...func(*iam.Options)) (*iam.CreateAccessKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateAccessKeyInput, ...func(*iam.Options)) *iam.CreateAccessKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *IAM) CreateAccessKey(ctx context.Context, params *iam.CreateAccessKeyI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateAccessKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *IAM) CreateAccountAlias(ctx context.Context, params *iam.CreateAccount ret := _m.Called(_ca...) var r0 *iam.CreateAccountAliasOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateAccountAliasInput, ...func(*iam.Options)) (*iam.CreateAccountAliasOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateAccountAliasInput, ...func(*iam.Options)) *iam.CreateAccountAliasOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *IAM) CreateAccountAlias(ctx context.Context, params *iam.CreateAccount } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateAccountAliasInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *IAM) CreateGroup(ctx context.Context, params *iam.CreateGroupInput, op ret := _m.Called(_ca...) var r0 *iam.CreateGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateGroupInput, ...func(*iam.Options)) (*iam.CreateGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateGroupInput, ...func(*iam.Options)) *iam.CreateGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *IAM) CreateGroup(ctx context.Context, params *iam.CreateGroupInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateGroupInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *IAM) CreateInstanceProfile(ctx context.Context, params *iam.CreateInst ret := _m.Called(_ca...) var r0 *iam.CreateInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateInstanceProfileInput, ...func(*iam.Options)) (*iam.CreateInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateInstanceProfileInput, ...func(*iam.Options)) *iam.CreateInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *IAM) CreateInstanceProfile(ctx context.Context, params *iam.CreateInst } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *IAM) CreateLoginProfile(ctx context.Context, params *iam.CreateLoginPr ret := _m.Called(_ca...) var r0 *iam.CreateLoginProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateLoginProfileInput, ...func(*iam.Options)) (*iam.CreateLoginProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateLoginProfileInput, ...func(*iam.Options)) *iam.CreateLoginProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *IAM) CreateLoginProfile(ctx context.Context, params *iam.CreateLoginPr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateLoginProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *IAM) CreateOpenIDConnectProvider(ctx context.Context, params *iam.Crea ret := _m.Called(_ca...) var r0 *iam.CreateOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.CreateOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.CreateOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *IAM) CreateOpenIDConnectProvider(ctx context.Context, params *iam.Crea } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *IAM) CreatePolicy(ctx context.Context, params *iam.CreatePolicyInput, ret := _m.Called(_ca...) var r0 *iam.CreatePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreatePolicyInput, ...func(*iam.Options)) (*iam.CreatePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreatePolicyInput, ...func(*iam.Options)) *iam.CreatePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *IAM) CreatePolicy(ctx context.Context, params *iam.CreatePolicyInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreatePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *IAM) CreatePolicyVersion(ctx context.Context, params *iam.CreatePolicy ret := _m.Called(_ca...) var r0 *iam.CreatePolicyVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreatePolicyVersionInput, ...func(*iam.Options)) (*iam.CreatePolicyVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreatePolicyVersionInput, ...func(*iam.Options)) *iam.CreatePolicyVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *IAM) CreatePolicyVersion(ctx context.Context, params *iam.CreatePolicy } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreatePolicyVersionInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *IAM) CreateRole(ctx context.Context, params *iam.CreateRoleInput, optF ret := _m.Called(_ca...) var r0 *iam.CreateRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateRoleInput, ...func(*iam.Options)) (*iam.CreateRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateRoleInput, ...func(*iam.Options)) *iam.CreateRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *IAM) CreateRole(ctx context.Context, params *iam.CreateRoleInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *IAM) CreateSAMLProvider(ctx context.Context, params *iam.CreateSAMLPro ret := _m.Called(_ca...) var r0 *iam.CreateSAMLProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateSAMLProviderInput, ...func(*iam.Options)) (*iam.CreateSAMLProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateSAMLProviderInput, ...func(*iam.Options)) *iam.CreateSAMLProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *IAM) CreateSAMLProvider(ctx context.Context, params *iam.CreateSAMLPro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateSAMLProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *IAM) CreateServiceLinkedRole(ctx context.Context, params *iam.CreateSe ret := _m.Called(_ca...) var r0 *iam.CreateServiceLinkedRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateServiceLinkedRoleInput, ...func(*iam.Options)) (*iam.CreateServiceLinkedRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateServiceLinkedRoleInput, ...func(*iam.Options)) *iam.CreateServiceLinkedRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *IAM) CreateServiceLinkedRole(ctx context.Context, params *iam.CreateSe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateServiceLinkedRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *IAM) CreateServiceSpecificCredential(ctx context.Context, params *iam. ret := _m.Called(_ca...) var r0 *iam.CreateServiceSpecificCredentialOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateServiceSpecificCredentialInput, ...func(*iam.Options)) (*iam.CreateServiceSpecificCredentialOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateServiceSpecificCredentialInput, ...func(*iam.Options)) *iam.CreateServiceSpecificCredentialOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *IAM) CreateServiceSpecificCredential(ctx context.Context, params *iam. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateServiceSpecificCredentialInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *IAM) CreateUser(ctx context.Context, params *iam.CreateUserInput, optF ret := _m.Called(_ca...) var r0 *iam.CreateUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateUserInput, ...func(*iam.Options)) (*iam.CreateUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateUserInput, ...func(*iam.Options)) *iam.CreateUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *IAM) CreateUser(ctx context.Context, params *iam.CreateUserInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *IAM) CreateVirtualMFADevice(ctx context.Context, params *iam.CreateVir ret := _m.Called(_ca...) var r0 *iam.CreateVirtualMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateVirtualMFADeviceInput, ...func(*iam.Options)) (*iam.CreateVirtualMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.CreateVirtualMFADeviceInput, ...func(*iam.Options)) *iam.CreateVirtualMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *IAM) CreateVirtualMFADevice(ctx context.Context, params *iam.CreateVir } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.CreateVirtualMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *IAM) DeactivateMFADevice(ctx context.Context, params *iam.DeactivateMF ret := _m.Called(_ca...) var r0 *iam.DeactivateMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeactivateMFADeviceInput, ...func(*iam.Options)) (*iam.DeactivateMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeactivateMFADeviceInput, ...func(*iam.Options)) *iam.DeactivateMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *IAM) DeactivateMFADevice(ctx context.Context, params *iam.DeactivateMF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeactivateMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *IAM) DeleteAccessKey(ctx context.Context, params *iam.DeleteAccessKeyI ret := _m.Called(_ca...) var r0 *iam.DeleteAccessKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteAccessKeyInput, ...func(*iam.Options)) (*iam.DeleteAccessKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteAccessKeyInput, ...func(*iam.Options)) *iam.DeleteAccessKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *IAM) DeleteAccessKey(ctx context.Context, params *iam.DeleteAccessKeyI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteAccessKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *IAM) DeleteAccountAlias(ctx context.Context, params *iam.DeleteAccount ret := _m.Called(_ca...) var r0 *iam.DeleteAccountAliasOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteAccountAliasInput, ...func(*iam.Options)) (*iam.DeleteAccountAliasOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteAccountAliasInput, ...func(*iam.Options)) *iam.DeleteAccountAliasOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *IAM) DeleteAccountAlias(ctx context.Context, params *iam.DeleteAccount } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteAccountAliasInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *IAM) DeleteAccountPasswordPolicy(ctx context.Context, params *iam.Dele ret := _m.Called(_ca...) var r0 *iam.DeleteAccountPasswordPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteAccountPasswordPolicyInput, ...func(*iam.Options)) (*iam.DeleteAccountPasswordPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteAccountPasswordPolicyInput, ...func(*iam.Options)) *iam.DeleteAccountPasswordPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *IAM) DeleteAccountPasswordPolicy(ctx context.Context, params *iam.Dele } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteAccountPasswordPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *IAM) DeleteGroup(ctx context.Context, params *iam.DeleteGroupInput, op ret := _m.Called(_ca...) var r0 *iam.DeleteGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteGroupInput, ...func(*iam.Options)) (*iam.DeleteGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteGroupInput, ...func(*iam.Options)) *iam.DeleteGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *IAM) DeleteGroup(ctx context.Context, params *iam.DeleteGroupInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteGroupInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -806,6 +884,10 @@ func (_m *IAM) DeleteGroupPolicy(ctx context.Context, params *iam.DeleteGroupPol ret := _m.Called(_ca...) var r0 *iam.DeleteGroupPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteGroupPolicyInput, ...func(*iam.Options)) (*iam.DeleteGroupPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteGroupPolicyInput, ...func(*iam.Options)) *iam.DeleteGroupPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -814,7 +896,6 @@ func (_m *IAM) DeleteGroupPolicy(ctx context.Context, params *iam.DeleteGroupPol } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteGroupPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -836,6 +917,10 @@ func (_m *IAM) DeleteInstanceProfile(ctx context.Context, params *iam.DeleteInst ret := _m.Called(_ca...) var r0 *iam.DeleteInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteInstanceProfileInput, ...func(*iam.Options)) (*iam.DeleteInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteInstanceProfileInput, ...func(*iam.Options)) *iam.DeleteInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -844,7 +929,6 @@ func (_m *IAM) DeleteInstanceProfile(ctx context.Context, params *iam.DeleteInst } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -866,6 +950,10 @@ func (_m *IAM) DeleteLoginProfile(ctx context.Context, params *iam.DeleteLoginPr ret := _m.Called(_ca...) var r0 *iam.DeleteLoginProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteLoginProfileInput, ...func(*iam.Options)) (*iam.DeleteLoginProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteLoginProfileInput, ...func(*iam.Options)) *iam.DeleteLoginProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -874,7 +962,6 @@ func (_m *IAM) DeleteLoginProfile(ctx context.Context, params *iam.DeleteLoginPr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteLoginProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -896,6 +983,10 @@ func (_m *IAM) DeleteOpenIDConnectProvider(ctx context.Context, params *iam.Dele ret := _m.Called(_ca...) var r0 *iam.DeleteOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.DeleteOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.DeleteOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -904,7 +995,6 @@ func (_m *IAM) DeleteOpenIDConnectProvider(ctx context.Context, params *iam.Dele } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -926,6 +1016,10 @@ func (_m *IAM) DeletePolicy(ctx context.Context, params *iam.DeletePolicyInput, ret := _m.Called(_ca...) var r0 *iam.DeletePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeletePolicyInput, ...func(*iam.Options)) (*iam.DeletePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeletePolicyInput, ...func(*iam.Options)) *iam.DeletePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -934,7 +1028,6 @@ func (_m *IAM) DeletePolicy(ctx context.Context, params *iam.DeletePolicyInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeletePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -956,6 +1049,10 @@ func (_m *IAM) DeletePolicyVersion(ctx context.Context, params *iam.DeletePolicy ret := _m.Called(_ca...) var r0 *iam.DeletePolicyVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeletePolicyVersionInput, ...func(*iam.Options)) (*iam.DeletePolicyVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeletePolicyVersionInput, ...func(*iam.Options)) *iam.DeletePolicyVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -964,7 +1061,6 @@ func (_m *IAM) DeletePolicyVersion(ctx context.Context, params *iam.DeletePolicy } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeletePolicyVersionInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -986,6 +1082,10 @@ func (_m *IAM) DeleteRole(ctx context.Context, params *iam.DeleteRoleInput, optF ret := _m.Called(_ca...) var r0 *iam.DeleteRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteRoleInput, ...func(*iam.Options)) (*iam.DeleteRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteRoleInput, ...func(*iam.Options)) *iam.DeleteRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -994,7 +1094,6 @@ func (_m *IAM) DeleteRole(ctx context.Context, params *iam.DeleteRoleInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1016,6 +1115,10 @@ func (_m *IAM) DeleteRolePermissionsBoundary(ctx context.Context, params *iam.De ret := _m.Called(_ca...) var r0 *iam.DeleteRolePermissionsBoundaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteRolePermissionsBoundaryInput, ...func(*iam.Options)) (*iam.DeleteRolePermissionsBoundaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteRolePermissionsBoundaryInput, ...func(*iam.Options)) *iam.DeleteRolePermissionsBoundaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1024,7 +1127,6 @@ func (_m *IAM) DeleteRolePermissionsBoundary(ctx context.Context, params *iam.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteRolePermissionsBoundaryInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1046,6 +1148,10 @@ func (_m *IAM) DeleteRolePolicy(ctx context.Context, params *iam.DeleteRolePolic ret := _m.Called(_ca...) var r0 *iam.DeleteRolePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteRolePolicyInput, ...func(*iam.Options)) (*iam.DeleteRolePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteRolePolicyInput, ...func(*iam.Options)) *iam.DeleteRolePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1054,7 +1160,6 @@ func (_m *IAM) DeleteRolePolicy(ctx context.Context, params *iam.DeleteRolePolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteRolePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1076,6 +1181,10 @@ func (_m *IAM) DeleteSAMLProvider(ctx context.Context, params *iam.DeleteSAMLPro ret := _m.Called(_ca...) var r0 *iam.DeleteSAMLProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteSAMLProviderInput, ...func(*iam.Options)) (*iam.DeleteSAMLProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteSAMLProviderInput, ...func(*iam.Options)) *iam.DeleteSAMLProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1084,7 +1193,6 @@ func (_m *IAM) DeleteSAMLProvider(ctx context.Context, params *iam.DeleteSAMLPro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteSAMLProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1106,6 +1214,10 @@ func (_m *IAM) DeleteSSHPublicKey(ctx context.Context, params *iam.DeleteSSHPubl ret := _m.Called(_ca...) var r0 *iam.DeleteSSHPublicKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteSSHPublicKeyInput, ...func(*iam.Options)) (*iam.DeleteSSHPublicKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteSSHPublicKeyInput, ...func(*iam.Options)) *iam.DeleteSSHPublicKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1114,7 +1226,6 @@ func (_m *IAM) DeleteSSHPublicKey(ctx context.Context, params *iam.DeleteSSHPubl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteSSHPublicKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1136,6 +1247,10 @@ func (_m *IAM) DeleteServerCertificate(ctx context.Context, params *iam.DeleteSe ret := _m.Called(_ca...) var r0 *iam.DeleteServerCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteServerCertificateInput, ...func(*iam.Options)) (*iam.DeleteServerCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteServerCertificateInput, ...func(*iam.Options)) *iam.DeleteServerCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1144,7 +1259,6 @@ func (_m *IAM) DeleteServerCertificate(ctx context.Context, params *iam.DeleteSe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteServerCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1166,6 +1280,10 @@ func (_m *IAM) DeleteServiceLinkedRole(ctx context.Context, params *iam.DeleteSe ret := _m.Called(_ca...) var r0 *iam.DeleteServiceLinkedRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteServiceLinkedRoleInput, ...func(*iam.Options)) (*iam.DeleteServiceLinkedRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteServiceLinkedRoleInput, ...func(*iam.Options)) *iam.DeleteServiceLinkedRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1174,7 +1292,6 @@ func (_m *IAM) DeleteServiceLinkedRole(ctx context.Context, params *iam.DeleteSe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteServiceLinkedRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1196,6 +1313,10 @@ func (_m *IAM) DeleteServiceSpecificCredential(ctx context.Context, params *iam. ret := _m.Called(_ca...) var r0 *iam.DeleteServiceSpecificCredentialOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteServiceSpecificCredentialInput, ...func(*iam.Options)) (*iam.DeleteServiceSpecificCredentialOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteServiceSpecificCredentialInput, ...func(*iam.Options)) *iam.DeleteServiceSpecificCredentialOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1204,7 +1325,6 @@ func (_m *IAM) DeleteServiceSpecificCredential(ctx context.Context, params *iam. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteServiceSpecificCredentialInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1226,6 +1346,10 @@ func (_m *IAM) DeleteSigningCertificate(ctx context.Context, params *iam.DeleteS ret := _m.Called(_ca...) var r0 *iam.DeleteSigningCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteSigningCertificateInput, ...func(*iam.Options)) (*iam.DeleteSigningCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteSigningCertificateInput, ...func(*iam.Options)) *iam.DeleteSigningCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1234,7 +1358,6 @@ func (_m *IAM) DeleteSigningCertificate(ctx context.Context, params *iam.DeleteS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteSigningCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1256,6 +1379,10 @@ func (_m *IAM) DeleteUser(ctx context.Context, params *iam.DeleteUserInput, optF ret := _m.Called(_ca...) var r0 *iam.DeleteUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteUserInput, ...func(*iam.Options)) (*iam.DeleteUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteUserInput, ...func(*iam.Options)) *iam.DeleteUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1264,7 +1391,6 @@ func (_m *IAM) DeleteUser(ctx context.Context, params *iam.DeleteUserInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1286,6 +1412,10 @@ func (_m *IAM) DeleteUserPermissionsBoundary(ctx context.Context, params *iam.De ret := _m.Called(_ca...) var r0 *iam.DeleteUserPermissionsBoundaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteUserPermissionsBoundaryInput, ...func(*iam.Options)) (*iam.DeleteUserPermissionsBoundaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteUserPermissionsBoundaryInput, ...func(*iam.Options)) *iam.DeleteUserPermissionsBoundaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1294,7 +1424,6 @@ func (_m *IAM) DeleteUserPermissionsBoundary(ctx context.Context, params *iam.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteUserPermissionsBoundaryInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1316,6 +1445,10 @@ func (_m *IAM) DeleteUserPolicy(ctx context.Context, params *iam.DeleteUserPolic ret := _m.Called(_ca...) var r0 *iam.DeleteUserPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteUserPolicyInput, ...func(*iam.Options)) (*iam.DeleteUserPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteUserPolicyInput, ...func(*iam.Options)) *iam.DeleteUserPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1324,7 +1457,6 @@ func (_m *IAM) DeleteUserPolicy(ctx context.Context, params *iam.DeleteUserPolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteUserPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1346,6 +1478,10 @@ func (_m *IAM) DeleteVirtualMFADevice(ctx context.Context, params *iam.DeleteVir ret := _m.Called(_ca...) var r0 *iam.DeleteVirtualMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteVirtualMFADeviceInput, ...func(*iam.Options)) (*iam.DeleteVirtualMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DeleteVirtualMFADeviceInput, ...func(*iam.Options)) *iam.DeleteVirtualMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1354,7 +1490,6 @@ func (_m *IAM) DeleteVirtualMFADevice(ctx context.Context, params *iam.DeleteVir } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DeleteVirtualMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1376,6 +1511,10 @@ func (_m *IAM) DetachGroupPolicy(ctx context.Context, params *iam.DetachGroupPol ret := _m.Called(_ca...) var r0 *iam.DetachGroupPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DetachGroupPolicyInput, ...func(*iam.Options)) (*iam.DetachGroupPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DetachGroupPolicyInput, ...func(*iam.Options)) *iam.DetachGroupPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1384,7 +1523,6 @@ func (_m *IAM) DetachGroupPolicy(ctx context.Context, params *iam.DetachGroupPol } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DetachGroupPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1406,6 +1544,10 @@ func (_m *IAM) DetachRolePolicy(ctx context.Context, params *iam.DetachRolePolic ret := _m.Called(_ca...) var r0 *iam.DetachRolePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DetachRolePolicyInput, ...func(*iam.Options)) (*iam.DetachRolePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DetachRolePolicyInput, ...func(*iam.Options)) *iam.DetachRolePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1414,7 +1556,6 @@ func (_m *IAM) DetachRolePolicy(ctx context.Context, params *iam.DetachRolePolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DetachRolePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1436,6 +1577,10 @@ func (_m *IAM) DetachUserPolicy(ctx context.Context, params *iam.DetachUserPolic ret := _m.Called(_ca...) var r0 *iam.DetachUserPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.DetachUserPolicyInput, ...func(*iam.Options)) (*iam.DetachUserPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.DetachUserPolicyInput, ...func(*iam.Options)) *iam.DetachUserPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1444,7 +1589,6 @@ func (_m *IAM) DetachUserPolicy(ctx context.Context, params *iam.DetachUserPolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.DetachUserPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1466,6 +1610,10 @@ func (_m *IAM) EnableMFADevice(ctx context.Context, params *iam.EnableMFADeviceI ret := _m.Called(_ca...) var r0 *iam.EnableMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.EnableMFADeviceInput, ...func(*iam.Options)) (*iam.EnableMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.EnableMFADeviceInput, ...func(*iam.Options)) *iam.EnableMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1474,7 +1622,6 @@ func (_m *IAM) EnableMFADevice(ctx context.Context, params *iam.EnableMFADeviceI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.EnableMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1496,6 +1643,10 @@ func (_m *IAM) GenerateCredentialReport(ctx context.Context, params *iam.Generat ret := _m.Called(_ca...) var r0 *iam.GenerateCredentialReportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GenerateCredentialReportInput, ...func(*iam.Options)) (*iam.GenerateCredentialReportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GenerateCredentialReportInput, ...func(*iam.Options)) *iam.GenerateCredentialReportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1504,7 +1655,6 @@ func (_m *IAM) GenerateCredentialReport(ctx context.Context, params *iam.Generat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GenerateCredentialReportInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1526,6 +1676,10 @@ func (_m *IAM) GenerateOrganizationsAccessReport(ctx context.Context, params *ia ret := _m.Called(_ca...) var r0 *iam.GenerateOrganizationsAccessReportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GenerateOrganizationsAccessReportInput, ...func(*iam.Options)) (*iam.GenerateOrganizationsAccessReportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GenerateOrganizationsAccessReportInput, ...func(*iam.Options)) *iam.GenerateOrganizationsAccessReportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1534,7 +1688,6 @@ func (_m *IAM) GenerateOrganizationsAccessReport(ctx context.Context, params *ia } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GenerateOrganizationsAccessReportInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1556,6 +1709,10 @@ func (_m *IAM) GenerateServiceLastAccessedDetails(ctx context.Context, params *i ret := _m.Called(_ca...) var r0 *iam.GenerateServiceLastAccessedDetailsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GenerateServiceLastAccessedDetailsInput, ...func(*iam.Options)) (*iam.GenerateServiceLastAccessedDetailsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GenerateServiceLastAccessedDetailsInput, ...func(*iam.Options)) *iam.GenerateServiceLastAccessedDetailsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1564,7 +1721,6 @@ func (_m *IAM) GenerateServiceLastAccessedDetails(ctx context.Context, params *i } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GenerateServiceLastAccessedDetailsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1586,6 +1742,10 @@ func (_m *IAM) GetAccessKeyLastUsed(ctx context.Context, params *iam.GetAccessKe ret := _m.Called(_ca...) var r0 *iam.GetAccessKeyLastUsedOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccessKeyLastUsedInput, ...func(*iam.Options)) (*iam.GetAccessKeyLastUsedOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccessKeyLastUsedInput, ...func(*iam.Options)) *iam.GetAccessKeyLastUsedOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1594,7 +1754,6 @@ func (_m *IAM) GetAccessKeyLastUsed(ctx context.Context, params *iam.GetAccessKe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetAccessKeyLastUsedInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1616,6 +1775,10 @@ func (_m *IAM) GetAccountAuthorizationDetails(ctx context.Context, params *iam.G ret := _m.Called(_ca...) var r0 *iam.GetAccountAuthorizationDetailsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccountAuthorizationDetailsInput, ...func(*iam.Options)) (*iam.GetAccountAuthorizationDetailsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccountAuthorizationDetailsInput, ...func(*iam.Options)) *iam.GetAccountAuthorizationDetailsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1624,7 +1787,6 @@ func (_m *IAM) GetAccountAuthorizationDetails(ctx context.Context, params *iam.G } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetAccountAuthorizationDetailsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1646,6 +1808,10 @@ func (_m *IAM) GetAccountPasswordPolicy(ctx context.Context, params *iam.GetAcco ret := _m.Called(_ca...) var r0 *iam.GetAccountPasswordPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccountPasswordPolicyInput, ...func(*iam.Options)) (*iam.GetAccountPasswordPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccountPasswordPolicyInput, ...func(*iam.Options)) *iam.GetAccountPasswordPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1654,7 +1820,6 @@ func (_m *IAM) GetAccountPasswordPolicy(ctx context.Context, params *iam.GetAcco } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetAccountPasswordPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1676,6 +1841,10 @@ func (_m *IAM) GetAccountSummary(ctx context.Context, params *iam.GetAccountSumm ret := _m.Called(_ca...) var r0 *iam.GetAccountSummaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccountSummaryInput, ...func(*iam.Options)) (*iam.GetAccountSummaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetAccountSummaryInput, ...func(*iam.Options)) *iam.GetAccountSummaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1684,7 +1853,6 @@ func (_m *IAM) GetAccountSummary(ctx context.Context, params *iam.GetAccountSumm } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetAccountSummaryInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1706,6 +1874,10 @@ func (_m *IAM) GetContextKeysForCustomPolicy(ctx context.Context, params *iam.Ge ret := _m.Called(_ca...) var r0 *iam.GetContextKeysForCustomPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetContextKeysForCustomPolicyInput, ...func(*iam.Options)) (*iam.GetContextKeysForCustomPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetContextKeysForCustomPolicyInput, ...func(*iam.Options)) *iam.GetContextKeysForCustomPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1714,7 +1886,6 @@ func (_m *IAM) GetContextKeysForCustomPolicy(ctx context.Context, params *iam.Ge } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetContextKeysForCustomPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1736,6 +1907,10 @@ func (_m *IAM) GetContextKeysForPrincipalPolicy(ctx context.Context, params *iam ret := _m.Called(_ca...) var r0 *iam.GetContextKeysForPrincipalPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetContextKeysForPrincipalPolicyInput, ...func(*iam.Options)) (*iam.GetContextKeysForPrincipalPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetContextKeysForPrincipalPolicyInput, ...func(*iam.Options)) *iam.GetContextKeysForPrincipalPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1744,7 +1919,6 @@ func (_m *IAM) GetContextKeysForPrincipalPolicy(ctx context.Context, params *iam } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetContextKeysForPrincipalPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1766,6 +1940,10 @@ func (_m *IAM) GetCredentialReport(ctx context.Context, params *iam.GetCredentia ret := _m.Called(_ca...) var r0 *iam.GetCredentialReportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetCredentialReportInput, ...func(*iam.Options)) (*iam.GetCredentialReportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetCredentialReportInput, ...func(*iam.Options)) *iam.GetCredentialReportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1774,7 +1952,6 @@ func (_m *IAM) GetCredentialReport(ctx context.Context, params *iam.GetCredentia } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetCredentialReportInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1796,6 +1973,10 @@ func (_m *IAM) GetGroup(ctx context.Context, params *iam.GetGroupInput, optFns . ret := _m.Called(_ca...) var r0 *iam.GetGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetGroupInput, ...func(*iam.Options)) (*iam.GetGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetGroupInput, ...func(*iam.Options)) *iam.GetGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1804,7 +1985,6 @@ func (_m *IAM) GetGroup(ctx context.Context, params *iam.GetGroupInput, optFns . } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetGroupInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1826,6 +2006,10 @@ func (_m *IAM) GetGroupPolicy(ctx context.Context, params *iam.GetGroupPolicyInp ret := _m.Called(_ca...) var r0 *iam.GetGroupPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetGroupPolicyInput, ...func(*iam.Options)) (*iam.GetGroupPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetGroupPolicyInput, ...func(*iam.Options)) *iam.GetGroupPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1834,7 +2018,6 @@ func (_m *IAM) GetGroupPolicy(ctx context.Context, params *iam.GetGroupPolicyInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetGroupPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1856,6 +2039,10 @@ func (_m *IAM) GetInstanceProfile(ctx context.Context, params *iam.GetInstancePr ret := _m.Called(_ca...) var r0 *iam.GetInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetInstanceProfileInput, ...func(*iam.Options)) (*iam.GetInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetInstanceProfileInput, ...func(*iam.Options)) *iam.GetInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1864,7 +2051,6 @@ func (_m *IAM) GetInstanceProfile(ctx context.Context, params *iam.GetInstancePr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1886,6 +2072,10 @@ func (_m *IAM) GetLoginProfile(ctx context.Context, params *iam.GetLoginProfileI ret := _m.Called(_ca...) var r0 *iam.GetLoginProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetLoginProfileInput, ...func(*iam.Options)) (*iam.GetLoginProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetLoginProfileInput, ...func(*iam.Options)) *iam.GetLoginProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1894,7 +2084,6 @@ func (_m *IAM) GetLoginProfile(ctx context.Context, params *iam.GetLoginProfileI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetLoginProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1904,6 +2093,39 @@ func (_m *IAM) GetLoginProfile(ctx context.Context, params *iam.GetLoginProfileI return r0, r1 } +// GetMFADevice provides a mock function with given fields: ctx, params, optFns +func (_m *IAM) GetMFADevice(ctx context.Context, params *iam.GetMFADeviceInput, optFns ...func(*iam.Options)) (*iam.GetMFADeviceOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *iam.GetMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetMFADeviceInput, ...func(*iam.Options)) (*iam.GetMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetMFADeviceInput, ...func(*iam.Options)) *iam.GetMFADeviceOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*iam.GetMFADeviceOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *iam.GetMFADeviceInput, ...func(*iam.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // GetOpenIDConnectProvider provides a mock function with given fields: ctx, params, optFns func (_m *IAM) GetOpenIDConnectProvider(ctx context.Context, params *iam.GetOpenIDConnectProviderInput, optFns ...func(*iam.Options)) (*iam.GetOpenIDConnectProviderOutput, error) { _va := make([]interface{}, len(optFns)) @@ -1916,6 +2138,10 @@ func (_m *IAM) GetOpenIDConnectProvider(ctx context.Context, params *iam.GetOpen ret := _m.Called(_ca...) var r0 *iam.GetOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.GetOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.GetOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1924,7 +2150,6 @@ func (_m *IAM) GetOpenIDConnectProvider(ctx context.Context, params *iam.GetOpen } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1946,6 +2171,10 @@ func (_m *IAM) GetOrganizationsAccessReport(ctx context.Context, params *iam.Get ret := _m.Called(_ca...) var r0 *iam.GetOrganizationsAccessReportOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetOrganizationsAccessReportInput, ...func(*iam.Options)) (*iam.GetOrganizationsAccessReportOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetOrganizationsAccessReportInput, ...func(*iam.Options)) *iam.GetOrganizationsAccessReportOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1954,7 +2183,6 @@ func (_m *IAM) GetOrganizationsAccessReport(ctx context.Context, params *iam.Get } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetOrganizationsAccessReportInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1976,6 +2204,10 @@ func (_m *IAM) GetPolicy(ctx context.Context, params *iam.GetPolicyInput, optFns ret := _m.Called(_ca...) var r0 *iam.GetPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetPolicyInput, ...func(*iam.Options)) (*iam.GetPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetPolicyInput, ...func(*iam.Options)) *iam.GetPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1984,7 +2216,6 @@ func (_m *IAM) GetPolicy(ctx context.Context, params *iam.GetPolicyInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2006,6 +2237,10 @@ func (_m *IAM) GetPolicyVersion(ctx context.Context, params *iam.GetPolicyVersio ret := _m.Called(_ca...) var r0 *iam.GetPolicyVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetPolicyVersionInput, ...func(*iam.Options)) (*iam.GetPolicyVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetPolicyVersionInput, ...func(*iam.Options)) *iam.GetPolicyVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2014,7 +2249,6 @@ func (_m *IAM) GetPolicyVersion(ctx context.Context, params *iam.GetPolicyVersio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetPolicyVersionInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2036,6 +2270,10 @@ func (_m *IAM) GetRole(ctx context.Context, params *iam.GetRoleInput, optFns ... ret := _m.Called(_ca...) var r0 *iam.GetRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetRoleInput, ...func(*iam.Options)) (*iam.GetRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetRoleInput, ...func(*iam.Options)) *iam.GetRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2044,7 +2282,6 @@ func (_m *IAM) GetRole(ctx context.Context, params *iam.GetRoleInput, optFns ... } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2066,6 +2303,10 @@ func (_m *IAM) GetRolePolicy(ctx context.Context, params *iam.GetRolePolicyInput ret := _m.Called(_ca...) var r0 *iam.GetRolePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetRolePolicyInput, ...func(*iam.Options)) (*iam.GetRolePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetRolePolicyInput, ...func(*iam.Options)) *iam.GetRolePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2074,7 +2315,6 @@ func (_m *IAM) GetRolePolicy(ctx context.Context, params *iam.GetRolePolicyInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetRolePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2096,6 +2336,10 @@ func (_m *IAM) GetSAMLProvider(ctx context.Context, params *iam.GetSAMLProviderI ret := _m.Called(_ca...) var r0 *iam.GetSAMLProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetSAMLProviderInput, ...func(*iam.Options)) (*iam.GetSAMLProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetSAMLProviderInput, ...func(*iam.Options)) *iam.GetSAMLProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2104,7 +2348,6 @@ func (_m *IAM) GetSAMLProvider(ctx context.Context, params *iam.GetSAMLProviderI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetSAMLProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2126,6 +2369,10 @@ func (_m *IAM) GetSSHPublicKey(ctx context.Context, params *iam.GetSSHPublicKeyI ret := _m.Called(_ca...) var r0 *iam.GetSSHPublicKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetSSHPublicKeyInput, ...func(*iam.Options)) (*iam.GetSSHPublicKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetSSHPublicKeyInput, ...func(*iam.Options)) *iam.GetSSHPublicKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2134,7 +2381,6 @@ func (_m *IAM) GetSSHPublicKey(ctx context.Context, params *iam.GetSSHPublicKeyI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetSSHPublicKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2156,6 +2402,10 @@ func (_m *IAM) GetServerCertificate(ctx context.Context, params *iam.GetServerCe ret := _m.Called(_ca...) var r0 *iam.GetServerCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServerCertificateInput, ...func(*iam.Options)) (*iam.GetServerCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServerCertificateInput, ...func(*iam.Options)) *iam.GetServerCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2164,7 +2414,6 @@ func (_m *IAM) GetServerCertificate(ctx context.Context, params *iam.GetServerCe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetServerCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2186,6 +2435,10 @@ func (_m *IAM) GetServiceLastAccessedDetails(ctx context.Context, params *iam.Ge ret := _m.Called(_ca...) var r0 *iam.GetServiceLastAccessedDetailsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServiceLastAccessedDetailsInput, ...func(*iam.Options)) (*iam.GetServiceLastAccessedDetailsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServiceLastAccessedDetailsInput, ...func(*iam.Options)) *iam.GetServiceLastAccessedDetailsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2194,7 +2447,6 @@ func (_m *IAM) GetServiceLastAccessedDetails(ctx context.Context, params *iam.Ge } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetServiceLastAccessedDetailsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2216,6 +2468,10 @@ func (_m *IAM) GetServiceLastAccessedDetailsWithEntities(ctx context.Context, pa ret := _m.Called(_ca...) var r0 *iam.GetServiceLastAccessedDetailsWithEntitiesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServiceLastAccessedDetailsWithEntitiesInput, ...func(*iam.Options)) (*iam.GetServiceLastAccessedDetailsWithEntitiesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServiceLastAccessedDetailsWithEntitiesInput, ...func(*iam.Options)) *iam.GetServiceLastAccessedDetailsWithEntitiesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2224,7 +2480,6 @@ func (_m *IAM) GetServiceLastAccessedDetailsWithEntities(ctx context.Context, pa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetServiceLastAccessedDetailsWithEntitiesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2246,6 +2501,10 @@ func (_m *IAM) GetServiceLinkedRoleDeletionStatus(ctx context.Context, params *i ret := _m.Called(_ca...) var r0 *iam.GetServiceLinkedRoleDeletionStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServiceLinkedRoleDeletionStatusInput, ...func(*iam.Options)) (*iam.GetServiceLinkedRoleDeletionStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetServiceLinkedRoleDeletionStatusInput, ...func(*iam.Options)) *iam.GetServiceLinkedRoleDeletionStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2254,7 +2513,6 @@ func (_m *IAM) GetServiceLinkedRoleDeletionStatus(ctx context.Context, params *i } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetServiceLinkedRoleDeletionStatusInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2276,6 +2534,10 @@ func (_m *IAM) GetUser(ctx context.Context, params *iam.GetUserInput, optFns ... ret := _m.Called(_ca...) var r0 *iam.GetUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetUserInput, ...func(*iam.Options)) (*iam.GetUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetUserInput, ...func(*iam.Options)) *iam.GetUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2284,7 +2546,6 @@ func (_m *IAM) GetUser(ctx context.Context, params *iam.GetUserInput, optFns ... } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2306,6 +2567,10 @@ func (_m *IAM) GetUserPolicy(ctx context.Context, params *iam.GetUserPolicyInput ret := _m.Called(_ca...) var r0 *iam.GetUserPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.GetUserPolicyInput, ...func(*iam.Options)) (*iam.GetUserPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.GetUserPolicyInput, ...func(*iam.Options)) *iam.GetUserPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2314,7 +2579,6 @@ func (_m *IAM) GetUserPolicy(ctx context.Context, params *iam.GetUserPolicyInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.GetUserPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2336,6 +2600,10 @@ func (_m *IAM) ListAccessKeys(ctx context.Context, params *iam.ListAccessKeysInp ret := _m.Called(_ca...) var r0 *iam.ListAccessKeysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAccessKeysInput, ...func(*iam.Options)) (*iam.ListAccessKeysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAccessKeysInput, ...func(*iam.Options)) *iam.ListAccessKeysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2344,7 +2612,6 @@ func (_m *IAM) ListAccessKeys(ctx context.Context, params *iam.ListAccessKeysInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListAccessKeysInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2366,6 +2633,10 @@ func (_m *IAM) ListAccountAliases(ctx context.Context, params *iam.ListAccountAl ret := _m.Called(_ca...) var r0 *iam.ListAccountAliasesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAccountAliasesInput, ...func(*iam.Options)) (*iam.ListAccountAliasesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAccountAliasesInput, ...func(*iam.Options)) *iam.ListAccountAliasesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2374,7 +2645,6 @@ func (_m *IAM) ListAccountAliases(ctx context.Context, params *iam.ListAccountAl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListAccountAliasesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2396,6 +2666,10 @@ func (_m *IAM) ListAttachedGroupPolicies(ctx context.Context, params *iam.ListAt ret := _m.Called(_ca...) var r0 *iam.ListAttachedGroupPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAttachedGroupPoliciesInput, ...func(*iam.Options)) (*iam.ListAttachedGroupPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAttachedGroupPoliciesInput, ...func(*iam.Options)) *iam.ListAttachedGroupPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2404,7 +2678,6 @@ func (_m *IAM) ListAttachedGroupPolicies(ctx context.Context, params *iam.ListAt } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListAttachedGroupPoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2426,6 +2699,10 @@ func (_m *IAM) ListAttachedRolePolicies(ctx context.Context, params *iam.ListAtt ret := _m.Called(_ca...) var r0 *iam.ListAttachedRolePoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAttachedRolePoliciesInput, ...func(*iam.Options)) (*iam.ListAttachedRolePoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAttachedRolePoliciesInput, ...func(*iam.Options)) *iam.ListAttachedRolePoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2434,7 +2711,6 @@ func (_m *IAM) ListAttachedRolePolicies(ctx context.Context, params *iam.ListAtt } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListAttachedRolePoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2456,6 +2732,10 @@ func (_m *IAM) ListAttachedUserPolicies(ctx context.Context, params *iam.ListAtt ret := _m.Called(_ca...) var r0 *iam.ListAttachedUserPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAttachedUserPoliciesInput, ...func(*iam.Options)) (*iam.ListAttachedUserPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListAttachedUserPoliciesInput, ...func(*iam.Options)) *iam.ListAttachedUserPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2464,7 +2744,6 @@ func (_m *IAM) ListAttachedUserPolicies(ctx context.Context, params *iam.ListAtt } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListAttachedUserPoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2486,6 +2765,10 @@ func (_m *IAM) ListEntitiesForPolicy(ctx context.Context, params *iam.ListEntiti ret := _m.Called(_ca...) var r0 *iam.ListEntitiesForPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListEntitiesForPolicyInput, ...func(*iam.Options)) (*iam.ListEntitiesForPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListEntitiesForPolicyInput, ...func(*iam.Options)) *iam.ListEntitiesForPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2494,7 +2777,6 @@ func (_m *IAM) ListEntitiesForPolicy(ctx context.Context, params *iam.ListEntiti } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListEntitiesForPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2516,6 +2798,10 @@ func (_m *IAM) ListGroupPolicies(ctx context.Context, params *iam.ListGroupPolic ret := _m.Called(_ca...) var r0 *iam.ListGroupPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListGroupPoliciesInput, ...func(*iam.Options)) (*iam.ListGroupPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListGroupPoliciesInput, ...func(*iam.Options)) *iam.ListGroupPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2524,7 +2810,6 @@ func (_m *IAM) ListGroupPolicies(ctx context.Context, params *iam.ListGroupPolic } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListGroupPoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2546,6 +2831,10 @@ func (_m *IAM) ListGroups(ctx context.Context, params *iam.ListGroupsInput, optF ret := _m.Called(_ca...) var r0 *iam.ListGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListGroupsInput, ...func(*iam.Options)) (*iam.ListGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListGroupsInput, ...func(*iam.Options)) *iam.ListGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2554,7 +2843,6 @@ func (_m *IAM) ListGroups(ctx context.Context, params *iam.ListGroupsInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListGroupsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2576,6 +2864,10 @@ func (_m *IAM) ListGroupsForUser(ctx context.Context, params *iam.ListGroupsForU ret := _m.Called(_ca...) var r0 *iam.ListGroupsForUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListGroupsForUserInput, ...func(*iam.Options)) (*iam.ListGroupsForUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListGroupsForUserInput, ...func(*iam.Options)) *iam.ListGroupsForUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2584,7 +2876,6 @@ func (_m *IAM) ListGroupsForUser(ctx context.Context, params *iam.ListGroupsForU } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListGroupsForUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2606,6 +2897,10 @@ func (_m *IAM) ListInstanceProfileTags(ctx context.Context, params *iam.ListInst ret := _m.Called(_ca...) var r0 *iam.ListInstanceProfileTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListInstanceProfileTagsInput, ...func(*iam.Options)) (*iam.ListInstanceProfileTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListInstanceProfileTagsInput, ...func(*iam.Options)) *iam.ListInstanceProfileTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2614,7 +2909,6 @@ func (_m *IAM) ListInstanceProfileTags(ctx context.Context, params *iam.ListInst } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListInstanceProfileTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2636,6 +2930,10 @@ func (_m *IAM) ListInstanceProfiles(ctx context.Context, params *iam.ListInstanc ret := _m.Called(_ca...) var r0 *iam.ListInstanceProfilesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListInstanceProfilesInput, ...func(*iam.Options)) (*iam.ListInstanceProfilesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListInstanceProfilesInput, ...func(*iam.Options)) *iam.ListInstanceProfilesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2644,7 +2942,6 @@ func (_m *IAM) ListInstanceProfiles(ctx context.Context, params *iam.ListInstanc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListInstanceProfilesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2666,6 +2963,10 @@ func (_m *IAM) ListInstanceProfilesForRole(ctx context.Context, params *iam.List ret := _m.Called(_ca...) var r0 *iam.ListInstanceProfilesForRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListInstanceProfilesForRoleInput, ...func(*iam.Options)) (*iam.ListInstanceProfilesForRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListInstanceProfilesForRoleInput, ...func(*iam.Options)) *iam.ListInstanceProfilesForRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2674,7 +2975,6 @@ func (_m *IAM) ListInstanceProfilesForRole(ctx context.Context, params *iam.List } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListInstanceProfilesForRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2696,6 +2996,10 @@ func (_m *IAM) ListMFADeviceTags(ctx context.Context, params *iam.ListMFADeviceT ret := _m.Called(_ca...) var r0 *iam.ListMFADeviceTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListMFADeviceTagsInput, ...func(*iam.Options)) (*iam.ListMFADeviceTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListMFADeviceTagsInput, ...func(*iam.Options)) *iam.ListMFADeviceTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2704,7 +3008,6 @@ func (_m *IAM) ListMFADeviceTags(ctx context.Context, params *iam.ListMFADeviceT } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListMFADeviceTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2726,6 +3029,10 @@ func (_m *IAM) ListMFADevices(ctx context.Context, params *iam.ListMFADevicesInp ret := _m.Called(_ca...) var r0 *iam.ListMFADevicesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListMFADevicesInput, ...func(*iam.Options)) (*iam.ListMFADevicesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListMFADevicesInput, ...func(*iam.Options)) *iam.ListMFADevicesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2734,7 +3041,6 @@ func (_m *IAM) ListMFADevices(ctx context.Context, params *iam.ListMFADevicesInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListMFADevicesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2756,6 +3062,10 @@ func (_m *IAM) ListOpenIDConnectProviderTags(ctx context.Context, params *iam.Li ret := _m.Called(_ca...) var r0 *iam.ListOpenIDConnectProviderTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListOpenIDConnectProviderTagsInput, ...func(*iam.Options)) (*iam.ListOpenIDConnectProviderTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListOpenIDConnectProviderTagsInput, ...func(*iam.Options)) *iam.ListOpenIDConnectProviderTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2764,7 +3074,6 @@ func (_m *IAM) ListOpenIDConnectProviderTags(ctx context.Context, params *iam.Li } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListOpenIDConnectProviderTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2786,6 +3095,10 @@ func (_m *IAM) ListOpenIDConnectProviders(ctx context.Context, params *iam.ListO ret := _m.Called(_ca...) var r0 *iam.ListOpenIDConnectProvidersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListOpenIDConnectProvidersInput, ...func(*iam.Options)) (*iam.ListOpenIDConnectProvidersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListOpenIDConnectProvidersInput, ...func(*iam.Options)) *iam.ListOpenIDConnectProvidersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2794,7 +3107,6 @@ func (_m *IAM) ListOpenIDConnectProviders(ctx context.Context, params *iam.ListO } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListOpenIDConnectProvidersInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2816,6 +3128,10 @@ func (_m *IAM) ListPolicies(ctx context.Context, params *iam.ListPoliciesInput, ret := _m.Called(_ca...) var r0 *iam.ListPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPoliciesInput, ...func(*iam.Options)) (*iam.ListPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPoliciesInput, ...func(*iam.Options)) *iam.ListPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2824,7 +3140,6 @@ func (_m *IAM) ListPolicies(ctx context.Context, params *iam.ListPoliciesInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListPoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2846,6 +3161,10 @@ func (_m *IAM) ListPoliciesGrantingServiceAccess(ctx context.Context, params *ia ret := _m.Called(_ca...) var r0 *iam.ListPoliciesGrantingServiceAccessOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPoliciesGrantingServiceAccessInput, ...func(*iam.Options)) (*iam.ListPoliciesGrantingServiceAccessOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPoliciesGrantingServiceAccessInput, ...func(*iam.Options)) *iam.ListPoliciesGrantingServiceAccessOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2854,7 +3173,6 @@ func (_m *IAM) ListPoliciesGrantingServiceAccess(ctx context.Context, params *ia } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListPoliciesGrantingServiceAccessInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2876,6 +3194,10 @@ func (_m *IAM) ListPolicyTags(ctx context.Context, params *iam.ListPolicyTagsInp ret := _m.Called(_ca...) var r0 *iam.ListPolicyTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPolicyTagsInput, ...func(*iam.Options)) (*iam.ListPolicyTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPolicyTagsInput, ...func(*iam.Options)) *iam.ListPolicyTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2884,7 +3206,6 @@ func (_m *IAM) ListPolicyTags(ctx context.Context, params *iam.ListPolicyTagsInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListPolicyTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2906,6 +3227,10 @@ func (_m *IAM) ListPolicyVersions(ctx context.Context, params *iam.ListPolicyVer ret := _m.Called(_ca...) var r0 *iam.ListPolicyVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPolicyVersionsInput, ...func(*iam.Options)) (*iam.ListPolicyVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListPolicyVersionsInput, ...func(*iam.Options)) *iam.ListPolicyVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2914,7 +3239,6 @@ func (_m *IAM) ListPolicyVersions(ctx context.Context, params *iam.ListPolicyVer } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListPolicyVersionsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2936,6 +3260,10 @@ func (_m *IAM) ListRolePolicies(ctx context.Context, params *iam.ListRolePolicie ret := _m.Called(_ca...) var r0 *iam.ListRolePoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListRolePoliciesInput, ...func(*iam.Options)) (*iam.ListRolePoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListRolePoliciesInput, ...func(*iam.Options)) *iam.ListRolePoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2944,7 +3272,6 @@ func (_m *IAM) ListRolePolicies(ctx context.Context, params *iam.ListRolePolicie } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListRolePoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2966,6 +3293,10 @@ func (_m *IAM) ListRoleTags(ctx context.Context, params *iam.ListRoleTagsInput, ret := _m.Called(_ca...) var r0 *iam.ListRoleTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListRoleTagsInput, ...func(*iam.Options)) (*iam.ListRoleTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListRoleTagsInput, ...func(*iam.Options)) *iam.ListRoleTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2974,7 +3305,6 @@ func (_m *IAM) ListRoleTags(ctx context.Context, params *iam.ListRoleTagsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListRoleTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2996,6 +3326,10 @@ func (_m *IAM) ListRoles(ctx context.Context, params *iam.ListRolesInput, optFns ret := _m.Called(_ca...) var r0 *iam.ListRolesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListRolesInput, ...func(*iam.Options)) (*iam.ListRolesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListRolesInput, ...func(*iam.Options)) *iam.ListRolesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3004,7 +3338,6 @@ func (_m *IAM) ListRoles(ctx context.Context, params *iam.ListRolesInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListRolesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3026,6 +3359,10 @@ func (_m *IAM) ListSAMLProviderTags(ctx context.Context, params *iam.ListSAMLPro ret := _m.Called(_ca...) var r0 *iam.ListSAMLProviderTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSAMLProviderTagsInput, ...func(*iam.Options)) (*iam.ListSAMLProviderTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSAMLProviderTagsInput, ...func(*iam.Options)) *iam.ListSAMLProviderTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3034,7 +3371,6 @@ func (_m *IAM) ListSAMLProviderTags(ctx context.Context, params *iam.ListSAMLPro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListSAMLProviderTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3056,6 +3392,10 @@ func (_m *IAM) ListSAMLProviders(ctx context.Context, params *iam.ListSAMLProvid ret := _m.Called(_ca...) var r0 *iam.ListSAMLProvidersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSAMLProvidersInput, ...func(*iam.Options)) (*iam.ListSAMLProvidersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSAMLProvidersInput, ...func(*iam.Options)) *iam.ListSAMLProvidersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3064,7 +3404,6 @@ func (_m *IAM) ListSAMLProviders(ctx context.Context, params *iam.ListSAMLProvid } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListSAMLProvidersInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3086,6 +3425,10 @@ func (_m *IAM) ListSSHPublicKeys(ctx context.Context, params *iam.ListSSHPublicK ret := _m.Called(_ca...) var r0 *iam.ListSSHPublicKeysOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSSHPublicKeysInput, ...func(*iam.Options)) (*iam.ListSSHPublicKeysOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSSHPublicKeysInput, ...func(*iam.Options)) *iam.ListSSHPublicKeysOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3094,7 +3437,6 @@ func (_m *IAM) ListSSHPublicKeys(ctx context.Context, params *iam.ListSSHPublicK } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListSSHPublicKeysInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3116,6 +3458,10 @@ func (_m *IAM) ListServerCertificateTags(ctx context.Context, params *iam.ListSe ret := _m.Called(_ca...) var r0 *iam.ListServerCertificateTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListServerCertificateTagsInput, ...func(*iam.Options)) (*iam.ListServerCertificateTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListServerCertificateTagsInput, ...func(*iam.Options)) *iam.ListServerCertificateTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3124,7 +3470,6 @@ func (_m *IAM) ListServerCertificateTags(ctx context.Context, params *iam.ListSe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListServerCertificateTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3146,6 +3491,10 @@ func (_m *IAM) ListServerCertificates(ctx context.Context, params *iam.ListServe ret := _m.Called(_ca...) var r0 *iam.ListServerCertificatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListServerCertificatesInput, ...func(*iam.Options)) (*iam.ListServerCertificatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListServerCertificatesInput, ...func(*iam.Options)) *iam.ListServerCertificatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3154,7 +3503,6 @@ func (_m *IAM) ListServerCertificates(ctx context.Context, params *iam.ListServe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListServerCertificatesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3176,6 +3524,10 @@ func (_m *IAM) ListServiceSpecificCredentials(ctx context.Context, params *iam.L ret := _m.Called(_ca...) var r0 *iam.ListServiceSpecificCredentialsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListServiceSpecificCredentialsInput, ...func(*iam.Options)) (*iam.ListServiceSpecificCredentialsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListServiceSpecificCredentialsInput, ...func(*iam.Options)) *iam.ListServiceSpecificCredentialsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3184,7 +3536,6 @@ func (_m *IAM) ListServiceSpecificCredentials(ctx context.Context, params *iam.L } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListServiceSpecificCredentialsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3206,6 +3557,10 @@ func (_m *IAM) ListSigningCertificates(ctx context.Context, params *iam.ListSign ret := _m.Called(_ca...) var r0 *iam.ListSigningCertificatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSigningCertificatesInput, ...func(*iam.Options)) (*iam.ListSigningCertificatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListSigningCertificatesInput, ...func(*iam.Options)) *iam.ListSigningCertificatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3214,7 +3569,6 @@ func (_m *IAM) ListSigningCertificates(ctx context.Context, params *iam.ListSign } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListSigningCertificatesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3236,6 +3590,10 @@ func (_m *IAM) ListUserPolicies(ctx context.Context, params *iam.ListUserPolicie ret := _m.Called(_ca...) var r0 *iam.ListUserPoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListUserPoliciesInput, ...func(*iam.Options)) (*iam.ListUserPoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListUserPoliciesInput, ...func(*iam.Options)) *iam.ListUserPoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3244,7 +3602,6 @@ func (_m *IAM) ListUserPolicies(ctx context.Context, params *iam.ListUserPolicie } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListUserPoliciesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3266,6 +3623,10 @@ func (_m *IAM) ListUserTags(ctx context.Context, params *iam.ListUserTagsInput, ret := _m.Called(_ca...) var r0 *iam.ListUserTagsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListUserTagsInput, ...func(*iam.Options)) (*iam.ListUserTagsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListUserTagsInput, ...func(*iam.Options)) *iam.ListUserTagsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3274,7 +3635,6 @@ func (_m *IAM) ListUserTags(ctx context.Context, params *iam.ListUserTagsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListUserTagsInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3296,6 +3656,10 @@ func (_m *IAM) ListUsers(ctx context.Context, params *iam.ListUsersInput, optFns ret := _m.Called(_ca...) var r0 *iam.ListUsersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListUsersInput, ...func(*iam.Options)) (*iam.ListUsersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListUsersInput, ...func(*iam.Options)) *iam.ListUsersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3304,7 +3668,6 @@ func (_m *IAM) ListUsers(ctx context.Context, params *iam.ListUsersInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListUsersInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3326,6 +3689,10 @@ func (_m *IAM) ListVirtualMFADevices(ctx context.Context, params *iam.ListVirtua ret := _m.Called(_ca...) var r0 *iam.ListVirtualMFADevicesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ListVirtualMFADevicesInput, ...func(*iam.Options)) (*iam.ListVirtualMFADevicesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ListVirtualMFADevicesInput, ...func(*iam.Options)) *iam.ListVirtualMFADevicesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3334,7 +3701,6 @@ func (_m *IAM) ListVirtualMFADevices(ctx context.Context, params *iam.ListVirtua } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ListVirtualMFADevicesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3356,6 +3722,10 @@ func (_m *IAM) PutGroupPolicy(ctx context.Context, params *iam.PutGroupPolicyInp ret := _m.Called(_ca...) var r0 *iam.PutGroupPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.PutGroupPolicyInput, ...func(*iam.Options)) (*iam.PutGroupPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.PutGroupPolicyInput, ...func(*iam.Options)) *iam.PutGroupPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3364,7 +3734,6 @@ func (_m *IAM) PutGroupPolicy(ctx context.Context, params *iam.PutGroupPolicyInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.PutGroupPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3386,6 +3755,10 @@ func (_m *IAM) PutRolePermissionsBoundary(ctx context.Context, params *iam.PutRo ret := _m.Called(_ca...) var r0 *iam.PutRolePermissionsBoundaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.PutRolePermissionsBoundaryInput, ...func(*iam.Options)) (*iam.PutRolePermissionsBoundaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.PutRolePermissionsBoundaryInput, ...func(*iam.Options)) *iam.PutRolePermissionsBoundaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3394,7 +3767,6 @@ func (_m *IAM) PutRolePermissionsBoundary(ctx context.Context, params *iam.PutRo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.PutRolePermissionsBoundaryInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3416,6 +3788,10 @@ func (_m *IAM) PutRolePolicy(ctx context.Context, params *iam.PutRolePolicyInput ret := _m.Called(_ca...) var r0 *iam.PutRolePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.PutRolePolicyInput, ...func(*iam.Options)) (*iam.PutRolePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.PutRolePolicyInput, ...func(*iam.Options)) *iam.PutRolePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3424,7 +3800,6 @@ func (_m *IAM) PutRolePolicy(ctx context.Context, params *iam.PutRolePolicyInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.PutRolePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3446,6 +3821,10 @@ func (_m *IAM) PutUserPermissionsBoundary(ctx context.Context, params *iam.PutUs ret := _m.Called(_ca...) var r0 *iam.PutUserPermissionsBoundaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.PutUserPermissionsBoundaryInput, ...func(*iam.Options)) (*iam.PutUserPermissionsBoundaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.PutUserPermissionsBoundaryInput, ...func(*iam.Options)) *iam.PutUserPermissionsBoundaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3454,7 +3833,6 @@ func (_m *IAM) PutUserPermissionsBoundary(ctx context.Context, params *iam.PutUs } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.PutUserPermissionsBoundaryInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3476,6 +3854,10 @@ func (_m *IAM) PutUserPolicy(ctx context.Context, params *iam.PutUserPolicyInput ret := _m.Called(_ca...) var r0 *iam.PutUserPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.PutUserPolicyInput, ...func(*iam.Options)) (*iam.PutUserPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.PutUserPolicyInput, ...func(*iam.Options)) *iam.PutUserPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3484,7 +3866,6 @@ func (_m *IAM) PutUserPolicy(ctx context.Context, params *iam.PutUserPolicyInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.PutUserPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3506,6 +3887,10 @@ func (_m *IAM) RemoveClientIDFromOpenIDConnectProvider(ctx context.Context, para ret := _m.Called(_ca...) var r0 *iam.RemoveClientIDFromOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.RemoveClientIDFromOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.RemoveClientIDFromOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.RemoveClientIDFromOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.RemoveClientIDFromOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3514,7 +3899,6 @@ func (_m *IAM) RemoveClientIDFromOpenIDConnectProvider(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.RemoveClientIDFromOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3536,6 +3920,10 @@ func (_m *IAM) RemoveRoleFromInstanceProfile(ctx context.Context, params *iam.Re ret := _m.Called(_ca...) var r0 *iam.RemoveRoleFromInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.RemoveRoleFromInstanceProfileInput, ...func(*iam.Options)) (*iam.RemoveRoleFromInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.RemoveRoleFromInstanceProfileInput, ...func(*iam.Options)) *iam.RemoveRoleFromInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3544,7 +3932,6 @@ func (_m *IAM) RemoveRoleFromInstanceProfile(ctx context.Context, params *iam.Re } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.RemoveRoleFromInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3566,6 +3953,10 @@ func (_m *IAM) RemoveUserFromGroup(ctx context.Context, params *iam.RemoveUserFr ret := _m.Called(_ca...) var r0 *iam.RemoveUserFromGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.RemoveUserFromGroupInput, ...func(*iam.Options)) (*iam.RemoveUserFromGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.RemoveUserFromGroupInput, ...func(*iam.Options)) *iam.RemoveUserFromGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3574,7 +3965,6 @@ func (_m *IAM) RemoveUserFromGroup(ctx context.Context, params *iam.RemoveUserFr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.RemoveUserFromGroupInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3596,6 +3986,10 @@ func (_m *IAM) ResetServiceSpecificCredential(ctx context.Context, params *iam.R ret := _m.Called(_ca...) var r0 *iam.ResetServiceSpecificCredentialOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ResetServiceSpecificCredentialInput, ...func(*iam.Options)) (*iam.ResetServiceSpecificCredentialOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ResetServiceSpecificCredentialInput, ...func(*iam.Options)) *iam.ResetServiceSpecificCredentialOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3604,7 +3998,6 @@ func (_m *IAM) ResetServiceSpecificCredential(ctx context.Context, params *iam.R } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ResetServiceSpecificCredentialInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3626,6 +4019,10 @@ func (_m *IAM) ResyncMFADevice(ctx context.Context, params *iam.ResyncMFADeviceI ret := _m.Called(_ca...) var r0 *iam.ResyncMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.ResyncMFADeviceInput, ...func(*iam.Options)) (*iam.ResyncMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.ResyncMFADeviceInput, ...func(*iam.Options)) *iam.ResyncMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3634,7 +4031,6 @@ func (_m *IAM) ResyncMFADevice(ctx context.Context, params *iam.ResyncMFADeviceI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.ResyncMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3656,6 +4052,10 @@ func (_m *IAM) SetDefaultPolicyVersion(ctx context.Context, params *iam.SetDefau ret := _m.Called(_ca...) var r0 *iam.SetDefaultPolicyVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.SetDefaultPolicyVersionInput, ...func(*iam.Options)) (*iam.SetDefaultPolicyVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.SetDefaultPolicyVersionInput, ...func(*iam.Options)) *iam.SetDefaultPolicyVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3664,7 +4064,6 @@ func (_m *IAM) SetDefaultPolicyVersion(ctx context.Context, params *iam.SetDefau } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.SetDefaultPolicyVersionInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3686,6 +4085,10 @@ func (_m *IAM) SetSecurityTokenServicePreferences(ctx context.Context, params *i ret := _m.Called(_ca...) var r0 *iam.SetSecurityTokenServicePreferencesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.SetSecurityTokenServicePreferencesInput, ...func(*iam.Options)) (*iam.SetSecurityTokenServicePreferencesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.SetSecurityTokenServicePreferencesInput, ...func(*iam.Options)) *iam.SetSecurityTokenServicePreferencesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3694,7 +4097,6 @@ func (_m *IAM) SetSecurityTokenServicePreferences(ctx context.Context, params *i } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.SetSecurityTokenServicePreferencesInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3716,6 +4118,10 @@ func (_m *IAM) SimulateCustomPolicy(ctx context.Context, params *iam.SimulateCus ret := _m.Called(_ca...) var r0 *iam.SimulateCustomPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.SimulateCustomPolicyInput, ...func(*iam.Options)) (*iam.SimulateCustomPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.SimulateCustomPolicyInput, ...func(*iam.Options)) *iam.SimulateCustomPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3724,7 +4130,6 @@ func (_m *IAM) SimulateCustomPolicy(ctx context.Context, params *iam.SimulateCus } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.SimulateCustomPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3746,6 +4151,10 @@ func (_m *IAM) SimulatePrincipalPolicy(ctx context.Context, params *iam.Simulate ret := _m.Called(_ca...) var r0 *iam.SimulatePrincipalPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.SimulatePrincipalPolicyInput, ...func(*iam.Options)) (*iam.SimulatePrincipalPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.SimulatePrincipalPolicyInput, ...func(*iam.Options)) *iam.SimulatePrincipalPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3754,7 +4163,6 @@ func (_m *IAM) SimulatePrincipalPolicy(ctx context.Context, params *iam.Simulate } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.SimulatePrincipalPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3776,6 +4184,10 @@ func (_m *IAM) TagInstanceProfile(ctx context.Context, params *iam.TagInstancePr ret := _m.Called(_ca...) var r0 *iam.TagInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagInstanceProfileInput, ...func(*iam.Options)) (*iam.TagInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagInstanceProfileInput, ...func(*iam.Options)) *iam.TagInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3784,7 +4196,6 @@ func (_m *IAM) TagInstanceProfile(ctx context.Context, params *iam.TagInstancePr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3806,6 +4217,10 @@ func (_m *IAM) TagMFADevice(ctx context.Context, params *iam.TagMFADeviceInput, ret := _m.Called(_ca...) var r0 *iam.TagMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagMFADeviceInput, ...func(*iam.Options)) (*iam.TagMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagMFADeviceInput, ...func(*iam.Options)) *iam.TagMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3814,7 +4229,6 @@ func (_m *IAM) TagMFADevice(ctx context.Context, params *iam.TagMFADeviceInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3836,6 +4250,10 @@ func (_m *IAM) TagOpenIDConnectProvider(ctx context.Context, params *iam.TagOpen ret := _m.Called(_ca...) var r0 *iam.TagOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.TagOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.TagOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3844,7 +4262,6 @@ func (_m *IAM) TagOpenIDConnectProvider(ctx context.Context, params *iam.TagOpen } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3866,6 +4283,10 @@ func (_m *IAM) TagPolicy(ctx context.Context, params *iam.TagPolicyInput, optFns ret := _m.Called(_ca...) var r0 *iam.TagPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagPolicyInput, ...func(*iam.Options)) (*iam.TagPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagPolicyInput, ...func(*iam.Options)) *iam.TagPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3874,7 +4295,6 @@ func (_m *IAM) TagPolicy(ctx context.Context, params *iam.TagPolicyInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3896,6 +4316,10 @@ func (_m *IAM) TagRole(ctx context.Context, params *iam.TagRoleInput, optFns ... ret := _m.Called(_ca...) var r0 *iam.TagRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagRoleInput, ...func(*iam.Options)) (*iam.TagRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagRoleInput, ...func(*iam.Options)) *iam.TagRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3904,7 +4328,6 @@ func (_m *IAM) TagRole(ctx context.Context, params *iam.TagRoleInput, optFns ... } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3926,6 +4349,10 @@ func (_m *IAM) TagSAMLProvider(ctx context.Context, params *iam.TagSAMLProviderI ret := _m.Called(_ca...) var r0 *iam.TagSAMLProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagSAMLProviderInput, ...func(*iam.Options)) (*iam.TagSAMLProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagSAMLProviderInput, ...func(*iam.Options)) *iam.TagSAMLProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3934,7 +4361,6 @@ func (_m *IAM) TagSAMLProvider(ctx context.Context, params *iam.TagSAMLProviderI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagSAMLProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3956,6 +4382,10 @@ func (_m *IAM) TagServerCertificate(ctx context.Context, params *iam.TagServerCe ret := _m.Called(_ca...) var r0 *iam.TagServerCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagServerCertificateInput, ...func(*iam.Options)) (*iam.TagServerCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagServerCertificateInput, ...func(*iam.Options)) *iam.TagServerCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3964,7 +4394,6 @@ func (_m *IAM) TagServerCertificate(ctx context.Context, params *iam.TagServerCe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagServerCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3986,6 +4415,10 @@ func (_m *IAM) TagUser(ctx context.Context, params *iam.TagUserInput, optFns ... ret := _m.Called(_ca...) var r0 *iam.TagUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.TagUserInput, ...func(*iam.Options)) (*iam.TagUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.TagUserInput, ...func(*iam.Options)) *iam.TagUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3994,7 +4427,6 @@ func (_m *IAM) TagUser(ctx context.Context, params *iam.TagUserInput, optFns ... } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.TagUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4016,6 +4448,10 @@ func (_m *IAM) UntagInstanceProfile(ctx context.Context, params *iam.UntagInstan ret := _m.Called(_ca...) var r0 *iam.UntagInstanceProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagInstanceProfileInput, ...func(*iam.Options)) (*iam.UntagInstanceProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagInstanceProfileInput, ...func(*iam.Options)) *iam.UntagInstanceProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4024,7 +4460,6 @@ func (_m *IAM) UntagInstanceProfile(ctx context.Context, params *iam.UntagInstan } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagInstanceProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4046,6 +4481,10 @@ func (_m *IAM) UntagMFADevice(ctx context.Context, params *iam.UntagMFADeviceInp ret := _m.Called(_ca...) var r0 *iam.UntagMFADeviceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagMFADeviceInput, ...func(*iam.Options)) (*iam.UntagMFADeviceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagMFADeviceInput, ...func(*iam.Options)) *iam.UntagMFADeviceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4054,7 +4493,6 @@ func (_m *IAM) UntagMFADevice(ctx context.Context, params *iam.UntagMFADeviceInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagMFADeviceInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4076,6 +4514,10 @@ func (_m *IAM) UntagOpenIDConnectProvider(ctx context.Context, params *iam.Untag ret := _m.Called(_ca...) var r0 *iam.UntagOpenIDConnectProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagOpenIDConnectProviderInput, ...func(*iam.Options)) (*iam.UntagOpenIDConnectProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagOpenIDConnectProviderInput, ...func(*iam.Options)) *iam.UntagOpenIDConnectProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4084,7 +4526,6 @@ func (_m *IAM) UntagOpenIDConnectProvider(ctx context.Context, params *iam.Untag } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagOpenIDConnectProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4106,6 +4547,10 @@ func (_m *IAM) UntagPolicy(ctx context.Context, params *iam.UntagPolicyInput, op ret := _m.Called(_ca...) var r0 *iam.UntagPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagPolicyInput, ...func(*iam.Options)) (*iam.UntagPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagPolicyInput, ...func(*iam.Options)) *iam.UntagPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4114,7 +4559,6 @@ func (_m *IAM) UntagPolicy(ctx context.Context, params *iam.UntagPolicyInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4136,6 +4580,10 @@ func (_m *IAM) UntagRole(ctx context.Context, params *iam.UntagRoleInput, optFns ret := _m.Called(_ca...) var r0 *iam.UntagRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagRoleInput, ...func(*iam.Options)) (*iam.UntagRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagRoleInput, ...func(*iam.Options)) *iam.UntagRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4144,7 +4592,6 @@ func (_m *IAM) UntagRole(ctx context.Context, params *iam.UntagRoleInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4166,6 +4613,10 @@ func (_m *IAM) UntagSAMLProvider(ctx context.Context, params *iam.UntagSAMLProvi ret := _m.Called(_ca...) var r0 *iam.UntagSAMLProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagSAMLProviderInput, ...func(*iam.Options)) (*iam.UntagSAMLProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagSAMLProviderInput, ...func(*iam.Options)) *iam.UntagSAMLProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4174,7 +4625,6 @@ func (_m *IAM) UntagSAMLProvider(ctx context.Context, params *iam.UntagSAMLProvi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagSAMLProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4196,6 +4646,10 @@ func (_m *IAM) UntagServerCertificate(ctx context.Context, params *iam.UntagServ ret := _m.Called(_ca...) var r0 *iam.UntagServerCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagServerCertificateInput, ...func(*iam.Options)) (*iam.UntagServerCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagServerCertificateInput, ...func(*iam.Options)) *iam.UntagServerCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4204,7 +4658,6 @@ func (_m *IAM) UntagServerCertificate(ctx context.Context, params *iam.UntagServ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagServerCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4226,6 +4679,10 @@ func (_m *IAM) UntagUser(ctx context.Context, params *iam.UntagUserInput, optFns ret := _m.Called(_ca...) var r0 *iam.UntagUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagUserInput, ...func(*iam.Options)) (*iam.UntagUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UntagUserInput, ...func(*iam.Options)) *iam.UntagUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4234,7 +4691,6 @@ func (_m *IAM) UntagUser(ctx context.Context, params *iam.UntagUserInput, optFns } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UntagUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4256,6 +4712,10 @@ func (_m *IAM) UpdateAccessKey(ctx context.Context, params *iam.UpdateAccessKeyI ret := _m.Called(_ca...) var r0 *iam.UpdateAccessKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateAccessKeyInput, ...func(*iam.Options)) (*iam.UpdateAccessKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateAccessKeyInput, ...func(*iam.Options)) *iam.UpdateAccessKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4264,7 +4724,6 @@ func (_m *IAM) UpdateAccessKey(ctx context.Context, params *iam.UpdateAccessKeyI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateAccessKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4286,6 +4745,10 @@ func (_m *IAM) UpdateAccountPasswordPolicy(ctx context.Context, params *iam.Upda ret := _m.Called(_ca...) var r0 *iam.UpdateAccountPasswordPolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateAccountPasswordPolicyInput, ...func(*iam.Options)) (*iam.UpdateAccountPasswordPolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateAccountPasswordPolicyInput, ...func(*iam.Options)) *iam.UpdateAccountPasswordPolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4294,7 +4757,6 @@ func (_m *IAM) UpdateAccountPasswordPolicy(ctx context.Context, params *iam.Upda } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateAccountPasswordPolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4316,6 +4778,10 @@ func (_m *IAM) UpdateAssumeRolePolicy(ctx context.Context, params *iam.UpdateAss ret := _m.Called(_ca...) var r0 *iam.UpdateAssumeRolePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateAssumeRolePolicyInput, ...func(*iam.Options)) (*iam.UpdateAssumeRolePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateAssumeRolePolicyInput, ...func(*iam.Options)) *iam.UpdateAssumeRolePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4324,7 +4790,6 @@ func (_m *IAM) UpdateAssumeRolePolicy(ctx context.Context, params *iam.UpdateAss } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateAssumeRolePolicyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4346,6 +4811,10 @@ func (_m *IAM) UpdateGroup(ctx context.Context, params *iam.UpdateGroupInput, op ret := _m.Called(_ca...) var r0 *iam.UpdateGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateGroupInput, ...func(*iam.Options)) (*iam.UpdateGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateGroupInput, ...func(*iam.Options)) *iam.UpdateGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4354,7 +4823,6 @@ func (_m *IAM) UpdateGroup(ctx context.Context, params *iam.UpdateGroupInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateGroupInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4376,6 +4844,10 @@ func (_m *IAM) UpdateLoginProfile(ctx context.Context, params *iam.UpdateLoginPr ret := _m.Called(_ca...) var r0 *iam.UpdateLoginProfileOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateLoginProfileInput, ...func(*iam.Options)) (*iam.UpdateLoginProfileOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateLoginProfileInput, ...func(*iam.Options)) *iam.UpdateLoginProfileOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4384,7 +4856,6 @@ func (_m *IAM) UpdateLoginProfile(ctx context.Context, params *iam.UpdateLoginPr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateLoginProfileInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4406,6 +4877,10 @@ func (_m *IAM) UpdateOpenIDConnectProviderThumbprint(ctx context.Context, params ret := _m.Called(_ca...) var r0 *iam.UpdateOpenIDConnectProviderThumbprintOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateOpenIDConnectProviderThumbprintInput, ...func(*iam.Options)) (*iam.UpdateOpenIDConnectProviderThumbprintOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateOpenIDConnectProviderThumbprintInput, ...func(*iam.Options)) *iam.UpdateOpenIDConnectProviderThumbprintOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4414,7 +4889,6 @@ func (_m *IAM) UpdateOpenIDConnectProviderThumbprint(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateOpenIDConnectProviderThumbprintInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4436,6 +4910,10 @@ func (_m *IAM) UpdateRole(ctx context.Context, params *iam.UpdateRoleInput, optF ret := _m.Called(_ca...) var r0 *iam.UpdateRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateRoleInput, ...func(*iam.Options)) (*iam.UpdateRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateRoleInput, ...func(*iam.Options)) *iam.UpdateRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4444,7 +4922,6 @@ func (_m *IAM) UpdateRole(ctx context.Context, params *iam.UpdateRoleInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateRoleInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4466,6 +4943,10 @@ func (_m *IAM) UpdateRoleDescription(ctx context.Context, params *iam.UpdateRole ret := _m.Called(_ca...) var r0 *iam.UpdateRoleDescriptionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateRoleDescriptionInput, ...func(*iam.Options)) (*iam.UpdateRoleDescriptionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateRoleDescriptionInput, ...func(*iam.Options)) *iam.UpdateRoleDescriptionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4474,7 +4955,6 @@ func (_m *IAM) UpdateRoleDescription(ctx context.Context, params *iam.UpdateRole } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateRoleDescriptionInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4496,6 +4976,10 @@ func (_m *IAM) UpdateSAMLProvider(ctx context.Context, params *iam.UpdateSAMLPro ret := _m.Called(_ca...) var r0 *iam.UpdateSAMLProviderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateSAMLProviderInput, ...func(*iam.Options)) (*iam.UpdateSAMLProviderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateSAMLProviderInput, ...func(*iam.Options)) *iam.UpdateSAMLProviderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4504,7 +4988,6 @@ func (_m *IAM) UpdateSAMLProvider(ctx context.Context, params *iam.UpdateSAMLPro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateSAMLProviderInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4526,6 +5009,10 @@ func (_m *IAM) UpdateSSHPublicKey(ctx context.Context, params *iam.UpdateSSHPubl ret := _m.Called(_ca...) var r0 *iam.UpdateSSHPublicKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateSSHPublicKeyInput, ...func(*iam.Options)) (*iam.UpdateSSHPublicKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateSSHPublicKeyInput, ...func(*iam.Options)) *iam.UpdateSSHPublicKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4534,7 +5021,6 @@ func (_m *IAM) UpdateSSHPublicKey(ctx context.Context, params *iam.UpdateSSHPubl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateSSHPublicKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4556,6 +5042,10 @@ func (_m *IAM) UpdateServerCertificate(ctx context.Context, params *iam.UpdateSe ret := _m.Called(_ca...) var r0 *iam.UpdateServerCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateServerCertificateInput, ...func(*iam.Options)) (*iam.UpdateServerCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateServerCertificateInput, ...func(*iam.Options)) *iam.UpdateServerCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4564,7 +5054,6 @@ func (_m *IAM) UpdateServerCertificate(ctx context.Context, params *iam.UpdateSe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateServerCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4586,6 +5075,10 @@ func (_m *IAM) UpdateServiceSpecificCredential(ctx context.Context, params *iam. ret := _m.Called(_ca...) var r0 *iam.UpdateServiceSpecificCredentialOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateServiceSpecificCredentialInput, ...func(*iam.Options)) (*iam.UpdateServiceSpecificCredentialOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateServiceSpecificCredentialInput, ...func(*iam.Options)) *iam.UpdateServiceSpecificCredentialOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4594,7 +5087,6 @@ func (_m *IAM) UpdateServiceSpecificCredential(ctx context.Context, params *iam. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateServiceSpecificCredentialInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4616,6 +5108,10 @@ func (_m *IAM) UpdateSigningCertificate(ctx context.Context, params *iam.UpdateS ret := _m.Called(_ca...) var r0 *iam.UpdateSigningCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateSigningCertificateInput, ...func(*iam.Options)) (*iam.UpdateSigningCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateSigningCertificateInput, ...func(*iam.Options)) *iam.UpdateSigningCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4624,7 +5120,6 @@ func (_m *IAM) UpdateSigningCertificate(ctx context.Context, params *iam.UpdateS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateSigningCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4646,6 +5141,10 @@ func (_m *IAM) UpdateUser(ctx context.Context, params *iam.UpdateUserInput, optF ret := _m.Called(_ca...) var r0 *iam.UpdateUserOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateUserInput, ...func(*iam.Options)) (*iam.UpdateUserOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UpdateUserInput, ...func(*iam.Options)) *iam.UpdateUserOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4654,7 +5153,6 @@ func (_m *IAM) UpdateUser(ctx context.Context, params *iam.UpdateUserInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UpdateUserInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4676,6 +5174,10 @@ func (_m *IAM) UploadSSHPublicKey(ctx context.Context, params *iam.UploadSSHPubl ret := _m.Called(_ca...) var r0 *iam.UploadSSHPublicKeyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UploadSSHPublicKeyInput, ...func(*iam.Options)) (*iam.UploadSSHPublicKeyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UploadSSHPublicKeyInput, ...func(*iam.Options)) *iam.UploadSSHPublicKeyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4684,7 +5186,6 @@ func (_m *IAM) UploadSSHPublicKey(ctx context.Context, params *iam.UploadSSHPubl } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UploadSSHPublicKeyInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4706,6 +5207,10 @@ func (_m *IAM) UploadServerCertificate(ctx context.Context, params *iam.UploadSe ret := _m.Called(_ca...) var r0 *iam.UploadServerCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UploadServerCertificateInput, ...func(*iam.Options)) (*iam.UploadServerCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UploadServerCertificateInput, ...func(*iam.Options)) *iam.UploadServerCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4714,7 +5219,6 @@ func (_m *IAM) UploadServerCertificate(ctx context.Context, params *iam.UploadSe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UploadServerCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4736,6 +5240,10 @@ func (_m *IAM) UploadSigningCertificate(ctx context.Context, params *iam.UploadS ret := _m.Called(_ca...) var r0 *iam.UploadSigningCertificateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *iam.UploadSigningCertificateInput, ...func(*iam.Options)) (*iam.UploadSigningCertificateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *iam.UploadSigningCertificateInput, ...func(*iam.Options)) *iam.UploadSigningCertificateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4744,7 +5252,6 @@ func (_m *IAM) UploadSigningCertificate(ctx context.Context, params *iam.UploadS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *iam.UploadSigningCertificateInput, ...func(*iam.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4753,3 +5260,17 @@ func (_m *IAM) UploadSigningCertificate(ctx context.Context, params *iam.UploadS return r0, r1 } + +// NewIAM creates a new instance of IAM. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewIAM(t interface { + mock.TestingT + Cleanup(func()) +}) *IAM { + mock := &IAM{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/Outposts.go b/pkg/eks/mocksv2/Outposts.go index 218184050d..76c2509631 100644 --- a/pkg/eks/mocksv2/Outposts.go +++ b/pkg/eks/mocksv2/Outposts.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *Outposts) CancelOrder(ctx context.Context, params *outposts.CancelOrde ret := _m.Called(_ca...) var r0 *outposts.CancelOrderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.CancelOrderInput, ...func(*outposts.Options)) (*outposts.CancelOrderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.CancelOrderInput, ...func(*outposts.Options)) *outposts.CancelOrderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *Outposts) CancelOrder(ctx context.Context, params *outposts.CancelOrde } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.CancelOrderInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *Outposts) CreateOrder(ctx context.Context, params *outposts.CreateOrde ret := _m.Called(_ca...) var r0 *outposts.CreateOrderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.CreateOrderInput, ...func(*outposts.Options)) (*outposts.CreateOrderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.CreateOrderInput, ...func(*outposts.Options)) *outposts.CreateOrderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *Outposts) CreateOrder(ctx context.Context, params *outposts.CreateOrde } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.CreateOrderInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *Outposts) CreateOutpost(ctx context.Context, params *outposts.CreateOu ret := _m.Called(_ca...) var r0 *outposts.CreateOutpostOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.CreateOutpostInput, ...func(*outposts.Options)) (*outposts.CreateOutpostOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.CreateOutpostInput, ...func(*outposts.Options)) *outposts.CreateOutpostOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *Outposts) CreateOutpost(ctx context.Context, params *outposts.CreateOu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.CreateOutpostInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *Outposts) CreateSite(ctx context.Context, params *outposts.CreateSiteI ret := _m.Called(_ca...) var r0 *outposts.CreateSiteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.CreateSiteInput, ...func(*outposts.Options)) (*outposts.CreateSiteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.CreateSiteInput, ...func(*outposts.Options)) *outposts.CreateSiteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *Outposts) CreateSite(ctx context.Context, params *outposts.CreateSiteI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.CreateSiteInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *Outposts) DeleteOutpost(ctx context.Context, params *outposts.DeleteOu ret := _m.Called(_ca...) var r0 *outposts.DeleteOutpostOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.DeleteOutpostInput, ...func(*outposts.Options)) (*outposts.DeleteOutpostOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.DeleteOutpostInput, ...func(*outposts.Options)) *outposts.DeleteOutpostOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *Outposts) DeleteOutpost(ctx context.Context, params *outposts.DeleteOu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.DeleteOutpostInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *Outposts) DeleteSite(ctx context.Context, params *outposts.DeleteSiteI ret := _m.Called(_ca...) var r0 *outposts.DeleteSiteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.DeleteSiteInput, ...func(*outposts.Options)) (*outposts.DeleteSiteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.DeleteSiteInput, ...func(*outposts.Options)) *outposts.DeleteSiteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *Outposts) DeleteSite(ctx context.Context, params *outposts.DeleteSiteI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.DeleteSiteInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *Outposts) GetCatalogItem(ctx context.Context, params *outposts.GetCata ret := _m.Called(_ca...) var r0 *outposts.GetCatalogItemOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetCatalogItemInput, ...func(*outposts.Options)) (*outposts.GetCatalogItemOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetCatalogItemInput, ...func(*outposts.Options)) *outposts.GetCatalogItemOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *Outposts) GetCatalogItem(ctx context.Context, params *outposts.GetCata } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetCatalogItemInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *Outposts) GetConnection(ctx context.Context, params *outposts.GetConne ret := _m.Called(_ca...) var r0 *outposts.GetConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetConnectionInput, ...func(*outposts.Options)) (*outposts.GetConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetConnectionInput, ...func(*outposts.Options)) *outposts.GetConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *Outposts) GetConnection(ctx context.Context, params *outposts.GetConne } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetConnectionInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *Outposts) GetOrder(ctx context.Context, params *outposts.GetOrderInput ret := _m.Called(_ca...) var r0 *outposts.GetOrderOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetOrderInput, ...func(*outposts.Options)) (*outposts.GetOrderOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetOrderInput, ...func(*outposts.Options)) *outposts.GetOrderOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *Outposts) GetOrder(ctx context.Context, params *outposts.GetOrderInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetOrderInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *Outposts) GetOutpost(ctx context.Context, params *outposts.GetOutpostI ret := _m.Called(_ca...) var r0 *outposts.GetOutpostOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetOutpostInput, ...func(*outposts.Options)) (*outposts.GetOutpostOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetOutpostInput, ...func(*outposts.Options)) *outposts.GetOutpostOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *Outposts) GetOutpost(ctx context.Context, params *outposts.GetOutpostI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetOutpostInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *Outposts) GetOutpostInstanceTypes(ctx context.Context, params *outpost ret := _m.Called(_ca...) var r0 *outposts.GetOutpostInstanceTypesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetOutpostInstanceTypesInput, ...func(*outposts.Options)) (*outposts.GetOutpostInstanceTypesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetOutpostInstanceTypesInput, ...func(*outposts.Options)) *outposts.GetOutpostInstanceTypesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *Outposts) GetOutpostInstanceTypes(ctx context.Context, params *outpost } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetOutpostInstanceTypesInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *Outposts) GetSite(ctx context.Context, params *outposts.GetSiteInput, ret := _m.Called(_ca...) var r0 *outposts.GetSiteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetSiteInput, ...func(*outposts.Options)) (*outposts.GetSiteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetSiteInput, ...func(*outposts.Options)) *outposts.GetSiteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *Outposts) GetSite(ctx context.Context, params *outposts.GetSiteInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetSiteInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *Outposts) GetSiteAddress(ctx context.Context, params *outposts.GetSite ret := _m.Called(_ca...) var r0 *outposts.GetSiteAddressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetSiteAddressInput, ...func(*outposts.Options)) (*outposts.GetSiteAddressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.GetSiteAddressInput, ...func(*outposts.Options)) *outposts.GetSiteAddressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *Outposts) GetSiteAddress(ctx context.Context, params *outposts.GetSite } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.GetSiteAddressInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *Outposts) ListAssets(ctx context.Context, params *outposts.ListAssetsI ret := _m.Called(_ca...) var r0 *outposts.ListAssetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListAssetsInput, ...func(*outposts.Options)) (*outposts.ListAssetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListAssetsInput, ...func(*outposts.Options)) *outposts.ListAssetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *Outposts) ListAssets(ctx context.Context, params *outposts.ListAssetsI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.ListAssetsInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *Outposts) ListCatalogItems(ctx context.Context, params *outposts.ListC ret := _m.Called(_ca...) var r0 *outposts.ListCatalogItemsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListCatalogItemsInput, ...func(*outposts.Options)) (*outposts.ListCatalogItemsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListCatalogItemsInput, ...func(*outposts.Options)) *outposts.ListCatalogItemsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *Outposts) ListCatalogItems(ctx context.Context, params *outposts.ListC } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.ListCatalogItemsInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *Outposts) ListOrders(ctx context.Context, params *outposts.ListOrdersI ret := _m.Called(_ca...) var r0 *outposts.ListOrdersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListOrdersInput, ...func(*outposts.Options)) (*outposts.ListOrdersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListOrdersInput, ...func(*outposts.Options)) *outposts.ListOrdersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *Outposts) ListOrders(ctx context.Context, params *outposts.ListOrdersI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.ListOrdersInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *Outposts) ListOutposts(ctx context.Context, params *outposts.ListOutpo ret := _m.Called(_ca...) var r0 *outposts.ListOutpostsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListOutpostsInput, ...func(*outposts.Options)) (*outposts.ListOutpostsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListOutpostsInput, ...func(*outposts.Options)) *outposts.ListOutpostsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *Outposts) ListOutposts(ctx context.Context, params *outposts.ListOutpo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.ListOutpostsInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *Outposts) ListSites(ctx context.Context, params *outposts.ListSitesInp ret := _m.Called(_ca...) var r0 *outposts.ListSitesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListSitesInput, ...func(*outposts.Options)) (*outposts.ListSitesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListSitesInput, ...func(*outposts.Options)) *outposts.ListSitesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *Outposts) ListSites(ctx context.Context, params *outposts.ListSitesInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.ListSitesInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *Outposts) ListTagsForResource(ctx context.Context, params *outposts.Li ret := _m.Called(_ca...) var r0 *outposts.ListTagsForResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListTagsForResourceInput, ...func(*outposts.Options)) (*outposts.ListTagsForResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.ListTagsForResourceInput, ...func(*outposts.Options)) *outposts.ListTagsForResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *Outposts) ListTagsForResource(ctx context.Context, params *outposts.Li } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.ListTagsForResourceInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *Outposts) StartConnection(ctx context.Context, params *outposts.StartC ret := _m.Called(_ca...) var r0 *outposts.StartConnectionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.StartConnectionInput, ...func(*outposts.Options)) (*outposts.StartConnectionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.StartConnectionInput, ...func(*outposts.Options)) *outposts.StartConnectionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *Outposts) StartConnection(ctx context.Context, params *outposts.StartC } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.StartConnectionInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *Outposts) TagResource(ctx context.Context, params *outposts.TagResourc ret := _m.Called(_ca...) var r0 *outposts.TagResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.TagResourceInput, ...func(*outposts.Options)) (*outposts.TagResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.TagResourceInput, ...func(*outposts.Options)) *outposts.TagResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *Outposts) TagResource(ctx context.Context, params *outposts.TagResourc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.TagResourceInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *Outposts) UntagResource(ctx context.Context, params *outposts.UntagRes ret := _m.Called(_ca...) var r0 *outposts.UntagResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.UntagResourceInput, ...func(*outposts.Options)) (*outposts.UntagResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.UntagResourceInput, ...func(*outposts.Options)) *outposts.UntagResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *Outposts) UntagResource(ctx context.Context, params *outposts.UntagRes } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.UntagResourceInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *Outposts) UpdateOutpost(ctx context.Context, params *outposts.UpdateOu ret := _m.Called(_ca...) var r0 *outposts.UpdateOutpostOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateOutpostInput, ...func(*outposts.Options)) (*outposts.UpdateOutpostOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateOutpostInput, ...func(*outposts.Options)) *outposts.UpdateOutpostOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *Outposts) UpdateOutpost(ctx context.Context, params *outposts.UpdateOu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.UpdateOutpostInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *Outposts) UpdateSite(ctx context.Context, params *outposts.UpdateSiteI ret := _m.Called(_ca...) var r0 *outposts.UpdateSiteOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateSiteInput, ...func(*outposts.Options)) (*outposts.UpdateSiteOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateSiteInput, ...func(*outposts.Options)) *outposts.UpdateSiteOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *Outposts) UpdateSite(ctx context.Context, params *outposts.UpdateSiteI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.UpdateSiteInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *Outposts) UpdateSiteAddress(ctx context.Context, params *outposts.Upda ret := _m.Called(_ca...) var r0 *outposts.UpdateSiteAddressOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateSiteAddressInput, ...func(*outposts.Options)) (*outposts.UpdateSiteAddressOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateSiteAddressInput, ...func(*outposts.Options)) *outposts.UpdateSiteAddressOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *Outposts) UpdateSiteAddress(ctx context.Context, params *outposts.Upda } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.UpdateSiteAddressInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *Outposts) UpdateSiteRackPhysicalProperties(ctx context.Context, params ret := _m.Called(_ca...) var r0 *outposts.UpdateSiteRackPhysicalPropertiesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateSiteRackPhysicalPropertiesInput, ...func(*outposts.Options)) (*outposts.UpdateSiteRackPhysicalPropertiesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *outposts.UpdateSiteRackPhysicalPropertiesInput, ...func(*outposts.Options)) *outposts.UpdateSiteRackPhysicalPropertiesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *Outposts) UpdateSiteRackPhysicalProperties(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *outposts.UpdateSiteRackPhysicalPropertiesInput, ...func(*outposts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -793,3 +871,17 @@ func (_m *Outposts) UpdateSiteRackPhysicalProperties(ctx context.Context, params return r0, r1 } + +// NewOutposts creates a new instance of Outposts. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewOutposts(t interface { + mock.TestingT + Cleanup(func()) +}) *Outposts { + mock := &Outposts{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/SSM.go b/pkg/eks/mocksv2/SSM.go index c8a70effa0..3d3f15d52a 100644 --- a/pkg/eks/mocksv2/SSM.go +++ b/pkg/eks/mocksv2/SSM.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *SSM) AddTagsToResource(ctx context.Context, params *ssm.AddTagsToResou ret := _m.Called(_ca...) var r0 *ssm.AddTagsToResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.AddTagsToResourceInput, ...func(*ssm.Options)) (*ssm.AddTagsToResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.AddTagsToResourceInput, ...func(*ssm.Options)) *ssm.AddTagsToResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *SSM) AddTagsToResource(ctx context.Context, params *ssm.AddTagsToResou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.AddTagsToResourceInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *SSM) AssociateOpsItemRelatedItem(ctx context.Context, params *ssm.Asso ret := _m.Called(_ca...) var r0 *ssm.AssociateOpsItemRelatedItemOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.AssociateOpsItemRelatedItemInput, ...func(*ssm.Options)) (*ssm.AssociateOpsItemRelatedItemOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.AssociateOpsItemRelatedItemInput, ...func(*ssm.Options)) *ssm.AssociateOpsItemRelatedItemOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *SSM) AssociateOpsItemRelatedItem(ctx context.Context, params *ssm.Asso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.AssociateOpsItemRelatedItemInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *SSM) CancelCommand(ctx context.Context, params *ssm.CancelCommandInput ret := _m.Called(_ca...) var r0 *ssm.CancelCommandOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CancelCommandInput, ...func(*ssm.Options)) (*ssm.CancelCommandOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CancelCommandInput, ...func(*ssm.Options)) *ssm.CancelCommandOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *SSM) CancelCommand(ctx context.Context, params *ssm.CancelCommandInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CancelCommandInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *SSM) CancelMaintenanceWindowExecution(ctx context.Context, params *ssm ret := _m.Called(_ca...) var r0 *ssm.CancelMaintenanceWindowExecutionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CancelMaintenanceWindowExecutionInput, ...func(*ssm.Options)) (*ssm.CancelMaintenanceWindowExecutionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CancelMaintenanceWindowExecutionInput, ...func(*ssm.Options)) *ssm.CancelMaintenanceWindowExecutionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *SSM) CancelMaintenanceWindowExecution(ctx context.Context, params *ssm } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CancelMaintenanceWindowExecutionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *SSM) CreateActivation(ctx context.Context, params *ssm.CreateActivatio ret := _m.Called(_ca...) var r0 *ssm.CreateActivationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateActivationInput, ...func(*ssm.Options)) (*ssm.CreateActivationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateActivationInput, ...func(*ssm.Options)) *ssm.CreateActivationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *SSM) CreateActivation(ctx context.Context, params *ssm.CreateActivatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateActivationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *SSM) CreateAssociation(ctx context.Context, params *ssm.CreateAssociat ret := _m.Called(_ca...) var r0 *ssm.CreateAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateAssociationInput, ...func(*ssm.Options)) (*ssm.CreateAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateAssociationInput, ...func(*ssm.Options)) *ssm.CreateAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *SSM) CreateAssociation(ctx context.Context, params *ssm.CreateAssociat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateAssociationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *SSM) CreateAssociationBatch(ctx context.Context, params *ssm.CreateAss ret := _m.Called(_ca...) var r0 *ssm.CreateAssociationBatchOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateAssociationBatchInput, ...func(*ssm.Options)) (*ssm.CreateAssociationBatchOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateAssociationBatchInput, ...func(*ssm.Options)) *ssm.CreateAssociationBatchOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *SSM) CreateAssociationBatch(ctx context.Context, params *ssm.CreateAss } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateAssociationBatchInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *SSM) CreateDocument(ctx context.Context, params *ssm.CreateDocumentInp ret := _m.Called(_ca...) var r0 *ssm.CreateDocumentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateDocumentInput, ...func(*ssm.Options)) (*ssm.CreateDocumentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateDocumentInput, ...func(*ssm.Options)) *ssm.CreateDocumentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *SSM) CreateDocument(ctx context.Context, params *ssm.CreateDocumentInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateDocumentInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -266,6 +290,10 @@ func (_m *SSM) CreateMaintenanceWindow(ctx context.Context, params *ssm.CreateMa ret := _m.Called(_ca...) var r0 *ssm.CreateMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.CreateMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.CreateMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -274,7 +302,6 @@ func (_m *SSM) CreateMaintenanceWindow(ctx context.Context, params *ssm.CreateMa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -296,6 +323,10 @@ func (_m *SSM) CreateOpsItem(ctx context.Context, params *ssm.CreateOpsItemInput ret := _m.Called(_ca...) var r0 *ssm.CreateOpsItemOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateOpsItemInput, ...func(*ssm.Options)) (*ssm.CreateOpsItemOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateOpsItemInput, ...func(*ssm.Options)) *ssm.CreateOpsItemOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -304,7 +335,6 @@ func (_m *SSM) CreateOpsItem(ctx context.Context, params *ssm.CreateOpsItemInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateOpsItemInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -326,6 +356,10 @@ func (_m *SSM) CreateOpsMetadata(ctx context.Context, params *ssm.CreateOpsMetad ret := _m.Called(_ca...) var r0 *ssm.CreateOpsMetadataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateOpsMetadataInput, ...func(*ssm.Options)) (*ssm.CreateOpsMetadataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateOpsMetadataInput, ...func(*ssm.Options)) *ssm.CreateOpsMetadataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -334,7 +368,6 @@ func (_m *SSM) CreateOpsMetadata(ctx context.Context, params *ssm.CreateOpsMetad } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateOpsMetadataInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -356,6 +389,10 @@ func (_m *SSM) CreatePatchBaseline(ctx context.Context, params *ssm.CreatePatchB ret := _m.Called(_ca...) var r0 *ssm.CreatePatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreatePatchBaselineInput, ...func(*ssm.Options)) (*ssm.CreatePatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreatePatchBaselineInput, ...func(*ssm.Options)) *ssm.CreatePatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -364,7 +401,6 @@ func (_m *SSM) CreatePatchBaseline(ctx context.Context, params *ssm.CreatePatchB } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreatePatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -386,6 +422,10 @@ func (_m *SSM) CreateResourceDataSync(ctx context.Context, params *ssm.CreateRes ret := _m.Called(_ca...) var r0 *ssm.CreateResourceDataSyncOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateResourceDataSyncInput, ...func(*ssm.Options)) (*ssm.CreateResourceDataSyncOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.CreateResourceDataSyncInput, ...func(*ssm.Options)) *ssm.CreateResourceDataSyncOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -394,7 +434,6 @@ func (_m *SSM) CreateResourceDataSync(ctx context.Context, params *ssm.CreateRes } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.CreateResourceDataSyncInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -416,6 +455,10 @@ func (_m *SSM) DeleteActivation(ctx context.Context, params *ssm.DeleteActivatio ret := _m.Called(_ca...) var r0 *ssm.DeleteActivationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteActivationInput, ...func(*ssm.Options)) (*ssm.DeleteActivationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteActivationInput, ...func(*ssm.Options)) *ssm.DeleteActivationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -424,7 +467,6 @@ func (_m *SSM) DeleteActivation(ctx context.Context, params *ssm.DeleteActivatio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteActivationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -446,6 +488,10 @@ func (_m *SSM) DeleteAssociation(ctx context.Context, params *ssm.DeleteAssociat ret := _m.Called(_ca...) var r0 *ssm.DeleteAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteAssociationInput, ...func(*ssm.Options)) (*ssm.DeleteAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteAssociationInput, ...func(*ssm.Options)) *ssm.DeleteAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -454,7 +500,6 @@ func (_m *SSM) DeleteAssociation(ctx context.Context, params *ssm.DeleteAssociat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteAssociationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -476,6 +521,10 @@ func (_m *SSM) DeleteDocument(ctx context.Context, params *ssm.DeleteDocumentInp ret := _m.Called(_ca...) var r0 *ssm.DeleteDocumentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteDocumentInput, ...func(*ssm.Options)) (*ssm.DeleteDocumentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteDocumentInput, ...func(*ssm.Options)) *ssm.DeleteDocumentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -484,7 +533,6 @@ func (_m *SSM) DeleteDocument(ctx context.Context, params *ssm.DeleteDocumentInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteDocumentInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -506,6 +554,10 @@ func (_m *SSM) DeleteInventory(ctx context.Context, params *ssm.DeleteInventoryI ret := _m.Called(_ca...) var r0 *ssm.DeleteInventoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteInventoryInput, ...func(*ssm.Options)) (*ssm.DeleteInventoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteInventoryInput, ...func(*ssm.Options)) *ssm.DeleteInventoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -514,7 +566,6 @@ func (_m *SSM) DeleteInventory(ctx context.Context, params *ssm.DeleteInventoryI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteInventoryInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -536,6 +587,10 @@ func (_m *SSM) DeleteMaintenanceWindow(ctx context.Context, params *ssm.DeleteMa ret := _m.Called(_ca...) var r0 *ssm.DeleteMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.DeleteMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.DeleteMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -544,7 +599,6 @@ func (_m *SSM) DeleteMaintenanceWindow(ctx context.Context, params *ssm.DeleteMa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -566,6 +620,10 @@ func (_m *SSM) DeleteOpsMetadata(ctx context.Context, params *ssm.DeleteOpsMetad ret := _m.Called(_ca...) var r0 *ssm.DeleteOpsMetadataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteOpsMetadataInput, ...func(*ssm.Options)) (*ssm.DeleteOpsMetadataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteOpsMetadataInput, ...func(*ssm.Options)) *ssm.DeleteOpsMetadataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -574,7 +632,6 @@ func (_m *SSM) DeleteOpsMetadata(ctx context.Context, params *ssm.DeleteOpsMetad } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteOpsMetadataInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -596,6 +653,10 @@ func (_m *SSM) DeleteParameter(ctx context.Context, params *ssm.DeleteParameterI ret := _m.Called(_ca...) var r0 *ssm.DeleteParameterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteParameterInput, ...func(*ssm.Options)) (*ssm.DeleteParameterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteParameterInput, ...func(*ssm.Options)) *ssm.DeleteParameterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -604,7 +665,6 @@ func (_m *SSM) DeleteParameter(ctx context.Context, params *ssm.DeleteParameterI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteParameterInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -626,6 +686,10 @@ func (_m *SSM) DeleteParameters(ctx context.Context, params *ssm.DeleteParameter ret := _m.Called(_ca...) var r0 *ssm.DeleteParametersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteParametersInput, ...func(*ssm.Options)) (*ssm.DeleteParametersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteParametersInput, ...func(*ssm.Options)) *ssm.DeleteParametersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -634,7 +698,6 @@ func (_m *SSM) DeleteParameters(ctx context.Context, params *ssm.DeleteParameter } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteParametersInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -656,6 +719,10 @@ func (_m *SSM) DeletePatchBaseline(ctx context.Context, params *ssm.DeletePatchB ret := _m.Called(_ca...) var r0 *ssm.DeletePatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeletePatchBaselineInput, ...func(*ssm.Options)) (*ssm.DeletePatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeletePatchBaselineInput, ...func(*ssm.Options)) *ssm.DeletePatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -664,7 +731,6 @@ func (_m *SSM) DeletePatchBaseline(ctx context.Context, params *ssm.DeletePatchB } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeletePatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -686,6 +752,10 @@ func (_m *SSM) DeleteResourceDataSync(ctx context.Context, params *ssm.DeleteRes ret := _m.Called(_ca...) var r0 *ssm.DeleteResourceDataSyncOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteResourceDataSyncInput, ...func(*ssm.Options)) (*ssm.DeleteResourceDataSyncOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteResourceDataSyncInput, ...func(*ssm.Options)) *ssm.DeleteResourceDataSyncOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -694,7 +764,6 @@ func (_m *SSM) DeleteResourceDataSync(ctx context.Context, params *ssm.DeleteRes } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteResourceDataSyncInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -716,6 +785,10 @@ func (_m *SSM) DeleteResourcePolicy(ctx context.Context, params *ssm.DeleteResou ret := _m.Called(_ca...) var r0 *ssm.DeleteResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteResourcePolicyInput, ...func(*ssm.Options)) (*ssm.DeleteResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeleteResourcePolicyInput, ...func(*ssm.Options)) *ssm.DeleteResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -724,7 +797,6 @@ func (_m *SSM) DeleteResourcePolicy(ctx context.Context, params *ssm.DeleteResou } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeleteResourcePolicyInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -746,6 +818,10 @@ func (_m *SSM) DeregisterManagedInstance(ctx context.Context, params *ssm.Deregi ret := _m.Called(_ca...) var r0 *ssm.DeregisterManagedInstanceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterManagedInstanceInput, ...func(*ssm.Options)) (*ssm.DeregisterManagedInstanceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterManagedInstanceInput, ...func(*ssm.Options)) *ssm.DeregisterManagedInstanceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -754,7 +830,6 @@ func (_m *SSM) DeregisterManagedInstance(ctx context.Context, params *ssm.Deregi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeregisterManagedInstanceInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -776,6 +851,10 @@ func (_m *SSM) DeregisterPatchBaselineForPatchGroup(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ssm.DeregisterPatchBaselineForPatchGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) (*ssm.DeregisterPatchBaselineForPatchGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) *ssm.DeregisterPatchBaselineForPatchGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -784,7 +863,6 @@ func (_m *SSM) DeregisterPatchBaselineForPatchGroup(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeregisterPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -806,6 +884,10 @@ func (_m *SSM) DeregisterTargetFromMaintenanceWindow(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ssm.DeregisterTargetFromMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterTargetFromMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.DeregisterTargetFromMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterTargetFromMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.DeregisterTargetFromMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -814,7 +896,6 @@ func (_m *SSM) DeregisterTargetFromMaintenanceWindow(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeregisterTargetFromMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -836,6 +917,10 @@ func (_m *SSM) DeregisterTaskFromMaintenanceWindow(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ssm.DeregisterTaskFromMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterTaskFromMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.DeregisterTaskFromMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DeregisterTaskFromMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.DeregisterTaskFromMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -844,7 +929,6 @@ func (_m *SSM) DeregisterTaskFromMaintenanceWindow(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DeregisterTaskFromMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -866,6 +950,10 @@ func (_m *SSM) DescribeActivations(ctx context.Context, params *ssm.DescribeActi ret := _m.Called(_ca...) var r0 *ssm.DescribeActivationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeActivationsInput, ...func(*ssm.Options)) (*ssm.DescribeActivationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeActivationsInput, ...func(*ssm.Options)) *ssm.DescribeActivationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -874,7 +962,6 @@ func (_m *SSM) DescribeActivations(ctx context.Context, params *ssm.DescribeActi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeActivationsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -896,6 +983,10 @@ func (_m *SSM) DescribeAssociation(ctx context.Context, params *ssm.DescribeAsso ret := _m.Called(_ca...) var r0 *ssm.DescribeAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAssociationInput, ...func(*ssm.Options)) (*ssm.DescribeAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAssociationInput, ...func(*ssm.Options)) *ssm.DescribeAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -904,7 +995,6 @@ func (_m *SSM) DescribeAssociation(ctx context.Context, params *ssm.DescribeAsso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeAssociationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -926,6 +1016,10 @@ func (_m *SSM) DescribeAssociationExecutionTargets(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ssm.DescribeAssociationExecutionTargetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAssociationExecutionTargetsInput, ...func(*ssm.Options)) (*ssm.DescribeAssociationExecutionTargetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAssociationExecutionTargetsInput, ...func(*ssm.Options)) *ssm.DescribeAssociationExecutionTargetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -934,7 +1028,6 @@ func (_m *SSM) DescribeAssociationExecutionTargets(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeAssociationExecutionTargetsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -956,6 +1049,10 @@ func (_m *SSM) DescribeAssociationExecutions(ctx context.Context, params *ssm.De ret := _m.Called(_ca...) var r0 *ssm.DescribeAssociationExecutionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAssociationExecutionsInput, ...func(*ssm.Options)) (*ssm.DescribeAssociationExecutionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAssociationExecutionsInput, ...func(*ssm.Options)) *ssm.DescribeAssociationExecutionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -964,7 +1061,6 @@ func (_m *SSM) DescribeAssociationExecutions(ctx context.Context, params *ssm.De } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeAssociationExecutionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -986,6 +1082,10 @@ func (_m *SSM) DescribeAutomationExecutions(ctx context.Context, params *ssm.Des ret := _m.Called(_ca...) var r0 *ssm.DescribeAutomationExecutionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAutomationExecutionsInput, ...func(*ssm.Options)) (*ssm.DescribeAutomationExecutionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAutomationExecutionsInput, ...func(*ssm.Options)) *ssm.DescribeAutomationExecutionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -994,7 +1094,6 @@ func (_m *SSM) DescribeAutomationExecutions(ctx context.Context, params *ssm.Des } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeAutomationExecutionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1016,6 +1115,10 @@ func (_m *SSM) DescribeAutomationStepExecutions(ctx context.Context, params *ssm ret := _m.Called(_ca...) var r0 *ssm.DescribeAutomationStepExecutionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAutomationStepExecutionsInput, ...func(*ssm.Options)) (*ssm.DescribeAutomationStepExecutionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAutomationStepExecutionsInput, ...func(*ssm.Options)) *ssm.DescribeAutomationStepExecutionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1024,7 +1127,6 @@ func (_m *SSM) DescribeAutomationStepExecutions(ctx context.Context, params *ssm } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeAutomationStepExecutionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1046,6 +1148,10 @@ func (_m *SSM) DescribeAvailablePatches(ctx context.Context, params *ssm.Describ ret := _m.Called(_ca...) var r0 *ssm.DescribeAvailablePatchesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAvailablePatchesInput, ...func(*ssm.Options)) (*ssm.DescribeAvailablePatchesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeAvailablePatchesInput, ...func(*ssm.Options)) *ssm.DescribeAvailablePatchesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1054,7 +1160,6 @@ func (_m *SSM) DescribeAvailablePatches(ctx context.Context, params *ssm.Describ } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeAvailablePatchesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1076,6 +1181,10 @@ func (_m *SSM) DescribeDocument(ctx context.Context, params *ssm.DescribeDocumen ret := _m.Called(_ca...) var r0 *ssm.DescribeDocumentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeDocumentInput, ...func(*ssm.Options)) (*ssm.DescribeDocumentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeDocumentInput, ...func(*ssm.Options)) *ssm.DescribeDocumentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1084,7 +1193,6 @@ func (_m *SSM) DescribeDocument(ctx context.Context, params *ssm.DescribeDocumen } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeDocumentInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1106,6 +1214,10 @@ func (_m *SSM) DescribeDocumentPermission(ctx context.Context, params *ssm.Descr ret := _m.Called(_ca...) var r0 *ssm.DescribeDocumentPermissionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeDocumentPermissionInput, ...func(*ssm.Options)) (*ssm.DescribeDocumentPermissionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeDocumentPermissionInput, ...func(*ssm.Options)) *ssm.DescribeDocumentPermissionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1114,7 +1226,6 @@ func (_m *SSM) DescribeDocumentPermission(ctx context.Context, params *ssm.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeDocumentPermissionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1136,6 +1247,10 @@ func (_m *SSM) DescribeEffectiveInstanceAssociations(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ssm.DescribeEffectiveInstanceAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeEffectiveInstanceAssociationsInput, ...func(*ssm.Options)) (*ssm.DescribeEffectiveInstanceAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeEffectiveInstanceAssociationsInput, ...func(*ssm.Options)) *ssm.DescribeEffectiveInstanceAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1144,7 +1259,6 @@ func (_m *SSM) DescribeEffectiveInstanceAssociations(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeEffectiveInstanceAssociationsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1166,6 +1280,10 @@ func (_m *SSM) DescribeEffectivePatchesForPatchBaseline(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ssm.DescribeEffectivePatchesForPatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeEffectivePatchesForPatchBaselineInput, ...func(*ssm.Options)) (*ssm.DescribeEffectivePatchesForPatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeEffectivePatchesForPatchBaselineInput, ...func(*ssm.Options)) *ssm.DescribeEffectivePatchesForPatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1174,7 +1292,6 @@ func (_m *SSM) DescribeEffectivePatchesForPatchBaseline(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeEffectivePatchesForPatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1196,6 +1313,10 @@ func (_m *SSM) DescribeInstanceAssociationsStatus(ctx context.Context, params *s ret := _m.Called(_ca...) var r0 *ssm.DescribeInstanceAssociationsStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstanceAssociationsStatusInput, ...func(*ssm.Options)) (*ssm.DescribeInstanceAssociationsStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstanceAssociationsStatusInput, ...func(*ssm.Options)) *ssm.DescribeInstanceAssociationsStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1204,7 +1325,6 @@ func (_m *SSM) DescribeInstanceAssociationsStatus(ctx context.Context, params *s } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeInstanceAssociationsStatusInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1226,6 +1346,10 @@ func (_m *SSM) DescribeInstanceInformation(ctx context.Context, params *ssm.Desc ret := _m.Called(_ca...) var r0 *ssm.DescribeInstanceInformationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstanceInformationInput, ...func(*ssm.Options)) (*ssm.DescribeInstanceInformationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstanceInformationInput, ...func(*ssm.Options)) *ssm.DescribeInstanceInformationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1234,7 +1358,6 @@ func (_m *SSM) DescribeInstanceInformation(ctx context.Context, params *ssm.Desc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeInstanceInformationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1256,6 +1379,10 @@ func (_m *SSM) DescribeInstancePatchStates(ctx context.Context, params *ssm.Desc ret := _m.Called(_ca...) var r0 *ssm.DescribeInstancePatchStatesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstancePatchStatesInput, ...func(*ssm.Options)) (*ssm.DescribeInstancePatchStatesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstancePatchStatesInput, ...func(*ssm.Options)) *ssm.DescribeInstancePatchStatesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1264,7 +1391,6 @@ func (_m *SSM) DescribeInstancePatchStates(ctx context.Context, params *ssm.Desc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeInstancePatchStatesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1286,6 +1412,10 @@ func (_m *SSM) DescribeInstancePatchStatesForPatchGroup(ctx context.Context, par ret := _m.Called(_ca...) var r0 *ssm.DescribeInstancePatchStatesForPatchGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstancePatchStatesForPatchGroupInput, ...func(*ssm.Options)) (*ssm.DescribeInstancePatchStatesForPatchGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstancePatchStatesForPatchGroupInput, ...func(*ssm.Options)) *ssm.DescribeInstancePatchStatesForPatchGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1294,7 +1424,6 @@ func (_m *SSM) DescribeInstancePatchStatesForPatchGroup(ctx context.Context, par } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeInstancePatchStatesForPatchGroupInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1316,6 +1445,10 @@ func (_m *SSM) DescribeInstancePatches(ctx context.Context, params *ssm.Describe ret := _m.Called(_ca...) var r0 *ssm.DescribeInstancePatchesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstancePatchesInput, ...func(*ssm.Options)) (*ssm.DescribeInstancePatchesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInstancePatchesInput, ...func(*ssm.Options)) *ssm.DescribeInstancePatchesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1324,7 +1457,6 @@ func (_m *SSM) DescribeInstancePatches(ctx context.Context, params *ssm.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeInstancePatchesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1346,6 +1478,10 @@ func (_m *SSM) DescribeInventoryDeletions(ctx context.Context, params *ssm.Descr ret := _m.Called(_ca...) var r0 *ssm.DescribeInventoryDeletionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInventoryDeletionsInput, ...func(*ssm.Options)) (*ssm.DescribeInventoryDeletionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeInventoryDeletionsInput, ...func(*ssm.Options)) *ssm.DescribeInventoryDeletionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1354,7 +1490,6 @@ func (_m *SSM) DescribeInventoryDeletions(ctx context.Context, params *ssm.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeInventoryDeletionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1376,6 +1511,10 @@ func (_m *SSM) DescribeMaintenanceWindowExecutionTaskInvocations(ctx context.Con ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowExecutionTaskInvocationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionTaskInvocationsInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowExecutionTaskInvocationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionTaskInvocationsInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowExecutionTaskInvocationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1384,7 +1523,6 @@ func (_m *SSM) DescribeMaintenanceWindowExecutionTaskInvocations(ctx context.Con } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionTaskInvocationsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1406,6 +1544,10 @@ func (_m *SSM) DescribeMaintenanceWindowExecutionTasks(ctx context.Context, para ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowExecutionTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionTasksInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowExecutionTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionTasksInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowExecutionTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1414,7 +1556,6 @@ func (_m *SSM) DescribeMaintenanceWindowExecutionTasks(ctx context.Context, para } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionTasksInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1436,6 +1577,10 @@ func (_m *SSM) DescribeMaintenanceWindowExecutions(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowExecutionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionsInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowExecutionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionsInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowExecutionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1444,7 +1589,6 @@ func (_m *SSM) DescribeMaintenanceWindowExecutions(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowExecutionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1466,6 +1610,10 @@ func (_m *SSM) DescribeMaintenanceWindowSchedule(ctx context.Context, params *ss ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowScheduleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowScheduleInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowScheduleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowScheduleInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowScheduleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1474,7 +1622,6 @@ func (_m *SSM) DescribeMaintenanceWindowSchedule(ctx context.Context, params *ss } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowScheduleInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1496,6 +1643,10 @@ func (_m *SSM) DescribeMaintenanceWindowTargets(ctx context.Context, params *ssm ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowTargetsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowTargetsInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowTargetsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowTargetsInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowTargetsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1504,7 +1655,6 @@ func (_m *SSM) DescribeMaintenanceWindowTargets(ctx context.Context, params *ssm } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowTargetsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1526,6 +1676,10 @@ func (_m *SSM) DescribeMaintenanceWindowTasks(ctx context.Context, params *ssm.D ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowTasksOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowTasksInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowTasksOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowTasksInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowTasksOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1534,7 +1688,6 @@ func (_m *SSM) DescribeMaintenanceWindowTasks(ctx context.Context, params *ssm.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowTasksInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1556,6 +1709,10 @@ func (_m *SSM) DescribeMaintenanceWindows(ctx context.Context, params *ssm.Descr ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowsInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowsInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1564,7 +1721,6 @@ func (_m *SSM) DescribeMaintenanceWindows(ctx context.Context, params *ssm.Descr } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1586,6 +1742,10 @@ func (_m *SSM) DescribeMaintenanceWindowsForTarget(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ssm.DescribeMaintenanceWindowsForTargetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowsForTargetInput, ...func(*ssm.Options)) (*ssm.DescribeMaintenanceWindowsForTargetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeMaintenanceWindowsForTargetInput, ...func(*ssm.Options)) *ssm.DescribeMaintenanceWindowsForTargetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1594,7 +1754,6 @@ func (_m *SSM) DescribeMaintenanceWindowsForTarget(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeMaintenanceWindowsForTargetInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1616,6 +1775,10 @@ func (_m *SSM) DescribeOpsItems(ctx context.Context, params *ssm.DescribeOpsItem ret := _m.Called(_ca...) var r0 *ssm.DescribeOpsItemsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeOpsItemsInput, ...func(*ssm.Options)) (*ssm.DescribeOpsItemsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeOpsItemsInput, ...func(*ssm.Options)) *ssm.DescribeOpsItemsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1624,7 +1787,6 @@ func (_m *SSM) DescribeOpsItems(ctx context.Context, params *ssm.DescribeOpsItem } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeOpsItemsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1646,6 +1808,10 @@ func (_m *SSM) DescribeParameters(ctx context.Context, params *ssm.DescribeParam ret := _m.Called(_ca...) var r0 *ssm.DescribeParametersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeParametersInput, ...func(*ssm.Options)) (*ssm.DescribeParametersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeParametersInput, ...func(*ssm.Options)) *ssm.DescribeParametersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1654,7 +1820,6 @@ func (_m *SSM) DescribeParameters(ctx context.Context, params *ssm.DescribeParam } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeParametersInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1676,6 +1841,10 @@ func (_m *SSM) DescribePatchBaselines(ctx context.Context, params *ssm.DescribeP ret := _m.Called(_ca...) var r0 *ssm.DescribePatchBaselinesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchBaselinesInput, ...func(*ssm.Options)) (*ssm.DescribePatchBaselinesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchBaselinesInput, ...func(*ssm.Options)) *ssm.DescribePatchBaselinesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1684,7 +1853,6 @@ func (_m *SSM) DescribePatchBaselines(ctx context.Context, params *ssm.DescribeP } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribePatchBaselinesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1706,6 +1874,10 @@ func (_m *SSM) DescribePatchGroupState(ctx context.Context, params *ssm.Describe ret := _m.Called(_ca...) var r0 *ssm.DescribePatchGroupStateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchGroupStateInput, ...func(*ssm.Options)) (*ssm.DescribePatchGroupStateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchGroupStateInput, ...func(*ssm.Options)) *ssm.DescribePatchGroupStateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1714,7 +1886,6 @@ func (_m *SSM) DescribePatchGroupState(ctx context.Context, params *ssm.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribePatchGroupStateInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1736,6 +1907,10 @@ func (_m *SSM) DescribePatchGroups(ctx context.Context, params *ssm.DescribePatc ret := _m.Called(_ca...) var r0 *ssm.DescribePatchGroupsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchGroupsInput, ...func(*ssm.Options)) (*ssm.DescribePatchGroupsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchGroupsInput, ...func(*ssm.Options)) *ssm.DescribePatchGroupsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1744,7 +1919,6 @@ func (_m *SSM) DescribePatchGroups(ctx context.Context, params *ssm.DescribePatc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribePatchGroupsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1766,6 +1940,10 @@ func (_m *SSM) DescribePatchProperties(ctx context.Context, params *ssm.Describe ret := _m.Called(_ca...) var r0 *ssm.DescribePatchPropertiesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchPropertiesInput, ...func(*ssm.Options)) (*ssm.DescribePatchPropertiesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribePatchPropertiesInput, ...func(*ssm.Options)) *ssm.DescribePatchPropertiesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1774,7 +1952,6 @@ func (_m *SSM) DescribePatchProperties(ctx context.Context, params *ssm.Describe } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribePatchPropertiesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1796,6 +1973,10 @@ func (_m *SSM) DescribeSessions(ctx context.Context, params *ssm.DescribeSession ret := _m.Called(_ca...) var r0 *ssm.DescribeSessionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeSessionsInput, ...func(*ssm.Options)) (*ssm.DescribeSessionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DescribeSessionsInput, ...func(*ssm.Options)) *ssm.DescribeSessionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1804,7 +1985,6 @@ func (_m *SSM) DescribeSessions(ctx context.Context, params *ssm.DescribeSession } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DescribeSessionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1826,6 +2006,10 @@ func (_m *SSM) DisassociateOpsItemRelatedItem(ctx context.Context, params *ssm.D ret := _m.Called(_ca...) var r0 *ssm.DisassociateOpsItemRelatedItemOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.DisassociateOpsItemRelatedItemInput, ...func(*ssm.Options)) (*ssm.DisassociateOpsItemRelatedItemOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.DisassociateOpsItemRelatedItemInput, ...func(*ssm.Options)) *ssm.DisassociateOpsItemRelatedItemOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1834,7 +2018,6 @@ func (_m *SSM) DisassociateOpsItemRelatedItem(ctx context.Context, params *ssm.D } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.DisassociateOpsItemRelatedItemInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1856,6 +2039,10 @@ func (_m *SSM) GetAutomationExecution(ctx context.Context, params *ssm.GetAutoma ret := _m.Called(_ca...) var r0 *ssm.GetAutomationExecutionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetAutomationExecutionInput, ...func(*ssm.Options)) (*ssm.GetAutomationExecutionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetAutomationExecutionInput, ...func(*ssm.Options)) *ssm.GetAutomationExecutionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1864,7 +2051,6 @@ func (_m *SSM) GetAutomationExecution(ctx context.Context, params *ssm.GetAutoma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetAutomationExecutionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1886,6 +2072,10 @@ func (_m *SSM) GetCalendarState(ctx context.Context, params *ssm.GetCalendarStat ret := _m.Called(_ca...) var r0 *ssm.GetCalendarStateOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetCalendarStateInput, ...func(*ssm.Options)) (*ssm.GetCalendarStateOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetCalendarStateInput, ...func(*ssm.Options)) *ssm.GetCalendarStateOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1894,7 +2084,6 @@ func (_m *SSM) GetCalendarState(ctx context.Context, params *ssm.GetCalendarStat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetCalendarStateInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1916,6 +2105,10 @@ func (_m *SSM) GetCommandInvocation(ctx context.Context, params *ssm.GetCommandI ret := _m.Called(_ca...) var r0 *ssm.GetCommandInvocationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetCommandInvocationInput, ...func(*ssm.Options)) (*ssm.GetCommandInvocationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetCommandInvocationInput, ...func(*ssm.Options)) *ssm.GetCommandInvocationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1924,7 +2117,6 @@ func (_m *SSM) GetCommandInvocation(ctx context.Context, params *ssm.GetCommandI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetCommandInvocationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1946,6 +2138,10 @@ func (_m *SSM) GetConnectionStatus(ctx context.Context, params *ssm.GetConnectio ret := _m.Called(_ca...) var r0 *ssm.GetConnectionStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetConnectionStatusInput, ...func(*ssm.Options)) (*ssm.GetConnectionStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetConnectionStatusInput, ...func(*ssm.Options)) *ssm.GetConnectionStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1954,7 +2150,6 @@ func (_m *SSM) GetConnectionStatus(ctx context.Context, params *ssm.GetConnectio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetConnectionStatusInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -1976,6 +2171,10 @@ func (_m *SSM) GetDefaultPatchBaseline(ctx context.Context, params *ssm.GetDefau ret := _m.Called(_ca...) var r0 *ssm.GetDefaultPatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetDefaultPatchBaselineInput, ...func(*ssm.Options)) (*ssm.GetDefaultPatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetDefaultPatchBaselineInput, ...func(*ssm.Options)) *ssm.GetDefaultPatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -1984,7 +2183,6 @@ func (_m *SSM) GetDefaultPatchBaseline(ctx context.Context, params *ssm.GetDefau } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetDefaultPatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2006,6 +2204,10 @@ func (_m *SSM) GetDeployablePatchSnapshotForInstance(ctx context.Context, params ret := _m.Called(_ca...) var r0 *ssm.GetDeployablePatchSnapshotForInstanceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetDeployablePatchSnapshotForInstanceInput, ...func(*ssm.Options)) (*ssm.GetDeployablePatchSnapshotForInstanceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetDeployablePatchSnapshotForInstanceInput, ...func(*ssm.Options)) *ssm.GetDeployablePatchSnapshotForInstanceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2014,7 +2216,6 @@ func (_m *SSM) GetDeployablePatchSnapshotForInstance(ctx context.Context, params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetDeployablePatchSnapshotForInstanceInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2036,6 +2237,10 @@ func (_m *SSM) GetDocument(ctx context.Context, params *ssm.GetDocumentInput, op ret := _m.Called(_ca...) var r0 *ssm.GetDocumentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetDocumentInput, ...func(*ssm.Options)) (*ssm.GetDocumentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetDocumentInput, ...func(*ssm.Options)) *ssm.GetDocumentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2044,7 +2249,6 @@ func (_m *SSM) GetDocument(ctx context.Context, params *ssm.GetDocumentInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetDocumentInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2066,6 +2270,10 @@ func (_m *SSM) GetInventory(ctx context.Context, params *ssm.GetInventoryInput, ret := _m.Called(_ca...) var r0 *ssm.GetInventoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetInventoryInput, ...func(*ssm.Options)) (*ssm.GetInventoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetInventoryInput, ...func(*ssm.Options)) *ssm.GetInventoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2074,7 +2282,6 @@ func (_m *SSM) GetInventory(ctx context.Context, params *ssm.GetInventoryInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetInventoryInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2096,6 +2303,10 @@ func (_m *SSM) GetInventorySchema(ctx context.Context, params *ssm.GetInventoryS ret := _m.Called(_ca...) var r0 *ssm.GetInventorySchemaOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetInventorySchemaInput, ...func(*ssm.Options)) (*ssm.GetInventorySchemaOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetInventorySchemaInput, ...func(*ssm.Options)) *ssm.GetInventorySchemaOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2104,7 +2315,6 @@ func (_m *SSM) GetInventorySchema(ctx context.Context, params *ssm.GetInventoryS } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetInventorySchemaInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2126,6 +2336,10 @@ func (_m *SSM) GetMaintenanceWindow(ctx context.Context, params *ssm.GetMaintena ret := _m.Called(_ca...) var r0 *ssm.GetMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.GetMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.GetMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2134,7 +2348,6 @@ func (_m *SSM) GetMaintenanceWindow(ctx context.Context, params *ssm.GetMaintena } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2156,6 +2369,10 @@ func (_m *SSM) GetMaintenanceWindowExecution(ctx context.Context, params *ssm.Ge ret := _m.Called(_ca...) var r0 *ssm.GetMaintenanceWindowExecutionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowExecutionInput, ...func(*ssm.Options)) (*ssm.GetMaintenanceWindowExecutionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowExecutionInput, ...func(*ssm.Options)) *ssm.GetMaintenanceWindowExecutionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2164,7 +2381,6 @@ func (_m *SSM) GetMaintenanceWindowExecution(ctx context.Context, params *ssm.Ge } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetMaintenanceWindowExecutionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2186,6 +2402,10 @@ func (_m *SSM) GetMaintenanceWindowExecutionTask(ctx context.Context, params *ss ret := _m.Called(_ca...) var r0 *ssm.GetMaintenanceWindowExecutionTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowExecutionTaskInput, ...func(*ssm.Options)) (*ssm.GetMaintenanceWindowExecutionTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowExecutionTaskInput, ...func(*ssm.Options)) *ssm.GetMaintenanceWindowExecutionTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2194,7 +2414,6 @@ func (_m *SSM) GetMaintenanceWindowExecutionTask(ctx context.Context, params *ss } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetMaintenanceWindowExecutionTaskInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2216,6 +2435,10 @@ func (_m *SSM) GetMaintenanceWindowExecutionTaskInvocation(ctx context.Context, ret := _m.Called(_ca...) var r0 *ssm.GetMaintenanceWindowExecutionTaskInvocationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowExecutionTaskInvocationInput, ...func(*ssm.Options)) (*ssm.GetMaintenanceWindowExecutionTaskInvocationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowExecutionTaskInvocationInput, ...func(*ssm.Options)) *ssm.GetMaintenanceWindowExecutionTaskInvocationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2224,7 +2447,6 @@ func (_m *SSM) GetMaintenanceWindowExecutionTaskInvocation(ctx context.Context, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetMaintenanceWindowExecutionTaskInvocationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2246,6 +2468,10 @@ func (_m *SSM) GetMaintenanceWindowTask(ctx context.Context, params *ssm.GetMain ret := _m.Called(_ca...) var r0 *ssm.GetMaintenanceWindowTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowTaskInput, ...func(*ssm.Options)) (*ssm.GetMaintenanceWindowTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetMaintenanceWindowTaskInput, ...func(*ssm.Options)) *ssm.GetMaintenanceWindowTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2254,7 +2480,6 @@ func (_m *SSM) GetMaintenanceWindowTask(ctx context.Context, params *ssm.GetMain } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetMaintenanceWindowTaskInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2276,6 +2501,10 @@ func (_m *SSM) GetOpsItem(ctx context.Context, params *ssm.GetOpsItemInput, optF ret := _m.Called(_ca...) var r0 *ssm.GetOpsItemOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetOpsItemInput, ...func(*ssm.Options)) (*ssm.GetOpsItemOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetOpsItemInput, ...func(*ssm.Options)) *ssm.GetOpsItemOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2284,7 +2513,6 @@ func (_m *SSM) GetOpsItem(ctx context.Context, params *ssm.GetOpsItemInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetOpsItemInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2306,6 +2534,10 @@ func (_m *SSM) GetOpsMetadata(ctx context.Context, params *ssm.GetOpsMetadataInp ret := _m.Called(_ca...) var r0 *ssm.GetOpsMetadataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetOpsMetadataInput, ...func(*ssm.Options)) (*ssm.GetOpsMetadataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetOpsMetadataInput, ...func(*ssm.Options)) *ssm.GetOpsMetadataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2314,7 +2546,6 @@ func (_m *SSM) GetOpsMetadata(ctx context.Context, params *ssm.GetOpsMetadataInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetOpsMetadataInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2336,6 +2567,10 @@ func (_m *SSM) GetOpsSummary(ctx context.Context, params *ssm.GetOpsSummaryInput ret := _m.Called(_ca...) var r0 *ssm.GetOpsSummaryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetOpsSummaryInput, ...func(*ssm.Options)) (*ssm.GetOpsSummaryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetOpsSummaryInput, ...func(*ssm.Options)) *ssm.GetOpsSummaryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2344,7 +2579,6 @@ func (_m *SSM) GetOpsSummary(ctx context.Context, params *ssm.GetOpsSummaryInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetOpsSummaryInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2366,6 +2600,10 @@ func (_m *SSM) GetParameter(ctx context.Context, params *ssm.GetParameterInput, ret := _m.Called(_ca...) var r0 *ssm.GetParameterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParameterInput, ...func(*ssm.Options)) (*ssm.GetParameterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParameterInput, ...func(*ssm.Options)) *ssm.GetParameterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2374,7 +2612,6 @@ func (_m *SSM) GetParameter(ctx context.Context, params *ssm.GetParameterInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetParameterInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2396,6 +2633,10 @@ func (_m *SSM) GetParameterHistory(ctx context.Context, params *ssm.GetParameter ret := _m.Called(_ca...) var r0 *ssm.GetParameterHistoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParameterHistoryInput, ...func(*ssm.Options)) (*ssm.GetParameterHistoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParameterHistoryInput, ...func(*ssm.Options)) *ssm.GetParameterHistoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2404,7 +2645,6 @@ func (_m *SSM) GetParameterHistory(ctx context.Context, params *ssm.GetParameter } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetParameterHistoryInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2426,6 +2666,10 @@ func (_m *SSM) GetParameters(ctx context.Context, params *ssm.GetParametersInput ret := _m.Called(_ca...) var r0 *ssm.GetParametersOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParametersInput, ...func(*ssm.Options)) (*ssm.GetParametersOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParametersInput, ...func(*ssm.Options)) *ssm.GetParametersOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2434,7 +2678,6 @@ func (_m *SSM) GetParameters(ctx context.Context, params *ssm.GetParametersInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetParametersInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2456,6 +2699,10 @@ func (_m *SSM) GetParametersByPath(ctx context.Context, params *ssm.GetParameter ret := _m.Called(_ca...) var r0 *ssm.GetParametersByPathOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParametersByPathInput, ...func(*ssm.Options)) (*ssm.GetParametersByPathOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetParametersByPathInput, ...func(*ssm.Options)) *ssm.GetParametersByPathOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2464,7 +2711,6 @@ func (_m *SSM) GetParametersByPath(ctx context.Context, params *ssm.GetParameter } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetParametersByPathInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2486,6 +2732,10 @@ func (_m *SSM) GetPatchBaseline(ctx context.Context, params *ssm.GetPatchBaselin ret := _m.Called(_ca...) var r0 *ssm.GetPatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetPatchBaselineInput, ...func(*ssm.Options)) (*ssm.GetPatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetPatchBaselineInput, ...func(*ssm.Options)) *ssm.GetPatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2494,7 +2744,6 @@ func (_m *SSM) GetPatchBaseline(ctx context.Context, params *ssm.GetPatchBaselin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetPatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2516,6 +2765,10 @@ func (_m *SSM) GetPatchBaselineForPatchGroup(ctx context.Context, params *ssm.Ge ret := _m.Called(_ca...) var r0 *ssm.GetPatchBaselineForPatchGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) (*ssm.GetPatchBaselineForPatchGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) *ssm.GetPatchBaselineForPatchGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2524,7 +2777,6 @@ func (_m *SSM) GetPatchBaselineForPatchGroup(ctx context.Context, params *ssm.Ge } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2546,6 +2798,10 @@ func (_m *SSM) GetResourcePolicies(ctx context.Context, params *ssm.GetResourceP ret := _m.Called(_ca...) var r0 *ssm.GetResourcePoliciesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetResourcePoliciesInput, ...func(*ssm.Options)) (*ssm.GetResourcePoliciesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetResourcePoliciesInput, ...func(*ssm.Options)) *ssm.GetResourcePoliciesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2554,7 +2810,6 @@ func (_m *SSM) GetResourcePolicies(ctx context.Context, params *ssm.GetResourceP } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetResourcePoliciesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2576,6 +2831,10 @@ func (_m *SSM) GetServiceSetting(ctx context.Context, params *ssm.GetServiceSett ret := _m.Called(_ca...) var r0 *ssm.GetServiceSettingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetServiceSettingInput, ...func(*ssm.Options)) (*ssm.GetServiceSettingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.GetServiceSettingInput, ...func(*ssm.Options)) *ssm.GetServiceSettingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2584,7 +2843,6 @@ func (_m *SSM) GetServiceSetting(ctx context.Context, params *ssm.GetServiceSett } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.GetServiceSettingInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2606,6 +2864,10 @@ func (_m *SSM) LabelParameterVersion(ctx context.Context, params *ssm.LabelParam ret := _m.Called(_ca...) var r0 *ssm.LabelParameterVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.LabelParameterVersionInput, ...func(*ssm.Options)) (*ssm.LabelParameterVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.LabelParameterVersionInput, ...func(*ssm.Options)) *ssm.LabelParameterVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2614,7 +2876,6 @@ func (_m *SSM) LabelParameterVersion(ctx context.Context, params *ssm.LabelParam } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.LabelParameterVersionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2636,6 +2897,10 @@ func (_m *SSM) ListAssociationVersions(ctx context.Context, params *ssm.ListAsso ret := _m.Called(_ca...) var r0 *ssm.ListAssociationVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListAssociationVersionsInput, ...func(*ssm.Options)) (*ssm.ListAssociationVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListAssociationVersionsInput, ...func(*ssm.Options)) *ssm.ListAssociationVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2644,7 +2909,6 @@ func (_m *SSM) ListAssociationVersions(ctx context.Context, params *ssm.ListAsso } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListAssociationVersionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2666,6 +2930,10 @@ func (_m *SSM) ListAssociations(ctx context.Context, params *ssm.ListAssociation ret := _m.Called(_ca...) var r0 *ssm.ListAssociationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListAssociationsInput, ...func(*ssm.Options)) (*ssm.ListAssociationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListAssociationsInput, ...func(*ssm.Options)) *ssm.ListAssociationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2674,7 +2942,6 @@ func (_m *SSM) ListAssociations(ctx context.Context, params *ssm.ListAssociation } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListAssociationsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2696,6 +2963,10 @@ func (_m *SSM) ListCommandInvocations(ctx context.Context, params *ssm.ListComma ret := _m.Called(_ca...) var r0 *ssm.ListCommandInvocationsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListCommandInvocationsInput, ...func(*ssm.Options)) (*ssm.ListCommandInvocationsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListCommandInvocationsInput, ...func(*ssm.Options)) *ssm.ListCommandInvocationsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2704,7 +2975,6 @@ func (_m *SSM) ListCommandInvocations(ctx context.Context, params *ssm.ListComma } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListCommandInvocationsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2726,6 +2996,10 @@ func (_m *SSM) ListCommands(ctx context.Context, params *ssm.ListCommandsInput, ret := _m.Called(_ca...) var r0 *ssm.ListCommandsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListCommandsInput, ...func(*ssm.Options)) (*ssm.ListCommandsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListCommandsInput, ...func(*ssm.Options)) *ssm.ListCommandsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2734,7 +3008,6 @@ func (_m *SSM) ListCommands(ctx context.Context, params *ssm.ListCommandsInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListCommandsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2756,6 +3029,10 @@ func (_m *SSM) ListComplianceItems(ctx context.Context, params *ssm.ListComplian ret := _m.Called(_ca...) var r0 *ssm.ListComplianceItemsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListComplianceItemsInput, ...func(*ssm.Options)) (*ssm.ListComplianceItemsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListComplianceItemsInput, ...func(*ssm.Options)) *ssm.ListComplianceItemsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2764,7 +3041,6 @@ func (_m *SSM) ListComplianceItems(ctx context.Context, params *ssm.ListComplian } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListComplianceItemsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2786,6 +3062,10 @@ func (_m *SSM) ListComplianceSummaries(ctx context.Context, params *ssm.ListComp ret := _m.Called(_ca...) var r0 *ssm.ListComplianceSummariesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListComplianceSummariesInput, ...func(*ssm.Options)) (*ssm.ListComplianceSummariesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListComplianceSummariesInput, ...func(*ssm.Options)) *ssm.ListComplianceSummariesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2794,7 +3074,6 @@ func (_m *SSM) ListComplianceSummaries(ctx context.Context, params *ssm.ListComp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListComplianceSummariesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2816,6 +3095,10 @@ func (_m *SSM) ListDocumentMetadataHistory(ctx context.Context, params *ssm.List ret := _m.Called(_ca...) var r0 *ssm.ListDocumentMetadataHistoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListDocumentMetadataHistoryInput, ...func(*ssm.Options)) (*ssm.ListDocumentMetadataHistoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListDocumentMetadataHistoryInput, ...func(*ssm.Options)) *ssm.ListDocumentMetadataHistoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2824,7 +3107,6 @@ func (_m *SSM) ListDocumentMetadataHistory(ctx context.Context, params *ssm.List } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListDocumentMetadataHistoryInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2846,6 +3128,10 @@ func (_m *SSM) ListDocumentVersions(ctx context.Context, params *ssm.ListDocumen ret := _m.Called(_ca...) var r0 *ssm.ListDocumentVersionsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListDocumentVersionsInput, ...func(*ssm.Options)) (*ssm.ListDocumentVersionsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListDocumentVersionsInput, ...func(*ssm.Options)) *ssm.ListDocumentVersionsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2854,7 +3140,6 @@ func (_m *SSM) ListDocumentVersions(ctx context.Context, params *ssm.ListDocumen } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListDocumentVersionsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2876,6 +3161,10 @@ func (_m *SSM) ListDocuments(ctx context.Context, params *ssm.ListDocumentsInput ret := _m.Called(_ca...) var r0 *ssm.ListDocumentsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListDocumentsInput, ...func(*ssm.Options)) (*ssm.ListDocumentsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListDocumentsInput, ...func(*ssm.Options)) *ssm.ListDocumentsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2884,7 +3173,6 @@ func (_m *SSM) ListDocuments(ctx context.Context, params *ssm.ListDocumentsInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListDocumentsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2906,6 +3194,10 @@ func (_m *SSM) ListInventoryEntries(ctx context.Context, params *ssm.ListInvento ret := _m.Called(_ca...) var r0 *ssm.ListInventoryEntriesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListInventoryEntriesInput, ...func(*ssm.Options)) (*ssm.ListInventoryEntriesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListInventoryEntriesInput, ...func(*ssm.Options)) *ssm.ListInventoryEntriesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2914,7 +3206,6 @@ func (_m *SSM) ListInventoryEntries(ctx context.Context, params *ssm.ListInvento } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListInventoryEntriesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2936,6 +3227,10 @@ func (_m *SSM) ListOpsItemEvents(ctx context.Context, params *ssm.ListOpsItemEve ret := _m.Called(_ca...) var r0 *ssm.ListOpsItemEventsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListOpsItemEventsInput, ...func(*ssm.Options)) (*ssm.ListOpsItemEventsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListOpsItemEventsInput, ...func(*ssm.Options)) *ssm.ListOpsItemEventsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2944,7 +3239,6 @@ func (_m *SSM) ListOpsItemEvents(ctx context.Context, params *ssm.ListOpsItemEve } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListOpsItemEventsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2966,6 +3260,10 @@ func (_m *SSM) ListOpsItemRelatedItems(ctx context.Context, params *ssm.ListOpsI ret := _m.Called(_ca...) var r0 *ssm.ListOpsItemRelatedItemsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListOpsItemRelatedItemsInput, ...func(*ssm.Options)) (*ssm.ListOpsItemRelatedItemsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListOpsItemRelatedItemsInput, ...func(*ssm.Options)) *ssm.ListOpsItemRelatedItemsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -2974,7 +3272,6 @@ func (_m *SSM) ListOpsItemRelatedItems(ctx context.Context, params *ssm.ListOpsI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListOpsItemRelatedItemsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -2996,6 +3293,10 @@ func (_m *SSM) ListOpsMetadata(ctx context.Context, params *ssm.ListOpsMetadataI ret := _m.Called(_ca...) var r0 *ssm.ListOpsMetadataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListOpsMetadataInput, ...func(*ssm.Options)) (*ssm.ListOpsMetadataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListOpsMetadataInput, ...func(*ssm.Options)) *ssm.ListOpsMetadataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3004,7 +3305,6 @@ func (_m *SSM) ListOpsMetadata(ctx context.Context, params *ssm.ListOpsMetadataI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListOpsMetadataInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3026,6 +3326,10 @@ func (_m *SSM) ListResourceComplianceSummaries(ctx context.Context, params *ssm. ret := _m.Called(_ca...) var r0 *ssm.ListResourceComplianceSummariesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListResourceComplianceSummariesInput, ...func(*ssm.Options)) (*ssm.ListResourceComplianceSummariesOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListResourceComplianceSummariesInput, ...func(*ssm.Options)) *ssm.ListResourceComplianceSummariesOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3034,7 +3338,6 @@ func (_m *SSM) ListResourceComplianceSummaries(ctx context.Context, params *ssm. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListResourceComplianceSummariesInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3056,6 +3359,10 @@ func (_m *SSM) ListResourceDataSync(ctx context.Context, params *ssm.ListResourc ret := _m.Called(_ca...) var r0 *ssm.ListResourceDataSyncOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListResourceDataSyncInput, ...func(*ssm.Options)) (*ssm.ListResourceDataSyncOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListResourceDataSyncInput, ...func(*ssm.Options)) *ssm.ListResourceDataSyncOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3064,7 +3371,6 @@ func (_m *SSM) ListResourceDataSync(ctx context.Context, params *ssm.ListResourc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListResourceDataSyncInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3086,6 +3392,10 @@ func (_m *SSM) ListTagsForResource(ctx context.Context, params *ssm.ListTagsForR ret := _m.Called(_ca...) var r0 *ssm.ListTagsForResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListTagsForResourceInput, ...func(*ssm.Options)) (*ssm.ListTagsForResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ListTagsForResourceInput, ...func(*ssm.Options)) *ssm.ListTagsForResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3094,7 +3404,6 @@ func (_m *SSM) ListTagsForResource(ctx context.Context, params *ssm.ListTagsForR } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ListTagsForResourceInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3116,6 +3425,10 @@ func (_m *SSM) ModifyDocumentPermission(ctx context.Context, params *ssm.ModifyD ret := _m.Called(_ca...) var r0 *ssm.ModifyDocumentPermissionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ModifyDocumentPermissionInput, ...func(*ssm.Options)) (*ssm.ModifyDocumentPermissionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ModifyDocumentPermissionInput, ...func(*ssm.Options)) *ssm.ModifyDocumentPermissionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3124,7 +3437,6 @@ func (_m *SSM) ModifyDocumentPermission(ctx context.Context, params *ssm.ModifyD } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ModifyDocumentPermissionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3146,6 +3458,10 @@ func (_m *SSM) PutComplianceItems(ctx context.Context, params *ssm.PutCompliance ret := _m.Called(_ca...) var r0 *ssm.PutComplianceItemsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutComplianceItemsInput, ...func(*ssm.Options)) (*ssm.PutComplianceItemsOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutComplianceItemsInput, ...func(*ssm.Options)) *ssm.PutComplianceItemsOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3154,7 +3470,6 @@ func (_m *SSM) PutComplianceItems(ctx context.Context, params *ssm.PutCompliance } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.PutComplianceItemsInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3176,6 +3491,10 @@ func (_m *SSM) PutInventory(ctx context.Context, params *ssm.PutInventoryInput, ret := _m.Called(_ca...) var r0 *ssm.PutInventoryOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutInventoryInput, ...func(*ssm.Options)) (*ssm.PutInventoryOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutInventoryInput, ...func(*ssm.Options)) *ssm.PutInventoryOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3184,7 +3503,6 @@ func (_m *SSM) PutInventory(ctx context.Context, params *ssm.PutInventoryInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.PutInventoryInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3206,6 +3524,10 @@ func (_m *SSM) PutParameter(ctx context.Context, params *ssm.PutParameterInput, ret := _m.Called(_ca...) var r0 *ssm.PutParameterOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutParameterInput, ...func(*ssm.Options)) (*ssm.PutParameterOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutParameterInput, ...func(*ssm.Options)) *ssm.PutParameterOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3214,7 +3536,6 @@ func (_m *SSM) PutParameter(ctx context.Context, params *ssm.PutParameterInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.PutParameterInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3236,6 +3557,10 @@ func (_m *SSM) PutResourcePolicy(ctx context.Context, params *ssm.PutResourcePol ret := _m.Called(_ca...) var r0 *ssm.PutResourcePolicyOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutResourcePolicyInput, ...func(*ssm.Options)) (*ssm.PutResourcePolicyOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.PutResourcePolicyInput, ...func(*ssm.Options)) *ssm.PutResourcePolicyOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3244,7 +3569,6 @@ func (_m *SSM) PutResourcePolicy(ctx context.Context, params *ssm.PutResourcePol } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.PutResourcePolicyInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3266,6 +3590,10 @@ func (_m *SSM) RegisterDefaultPatchBaseline(ctx context.Context, params *ssm.Reg ret := _m.Called(_ca...) var r0 *ssm.RegisterDefaultPatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterDefaultPatchBaselineInput, ...func(*ssm.Options)) (*ssm.RegisterDefaultPatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterDefaultPatchBaselineInput, ...func(*ssm.Options)) *ssm.RegisterDefaultPatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3274,7 +3602,6 @@ func (_m *SSM) RegisterDefaultPatchBaseline(ctx context.Context, params *ssm.Reg } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.RegisterDefaultPatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3296,6 +3623,10 @@ func (_m *SSM) RegisterPatchBaselineForPatchGroup(ctx context.Context, params *s ret := _m.Called(_ca...) var r0 *ssm.RegisterPatchBaselineForPatchGroupOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) (*ssm.RegisterPatchBaselineForPatchGroupOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) *ssm.RegisterPatchBaselineForPatchGroupOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3304,7 +3635,6 @@ func (_m *SSM) RegisterPatchBaselineForPatchGroup(ctx context.Context, params *s } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.RegisterPatchBaselineForPatchGroupInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3326,6 +3656,10 @@ func (_m *SSM) RegisterTargetWithMaintenanceWindow(ctx context.Context, params * ret := _m.Called(_ca...) var r0 *ssm.RegisterTargetWithMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterTargetWithMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.RegisterTargetWithMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterTargetWithMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.RegisterTargetWithMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3334,7 +3668,6 @@ func (_m *SSM) RegisterTargetWithMaintenanceWindow(ctx context.Context, params * } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.RegisterTargetWithMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3356,6 +3689,10 @@ func (_m *SSM) RegisterTaskWithMaintenanceWindow(ctx context.Context, params *ss ret := _m.Called(_ca...) var r0 *ssm.RegisterTaskWithMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterTaskWithMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.RegisterTaskWithMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.RegisterTaskWithMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.RegisterTaskWithMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3364,7 +3701,6 @@ func (_m *SSM) RegisterTaskWithMaintenanceWindow(ctx context.Context, params *ss } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.RegisterTaskWithMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3386,6 +3722,10 @@ func (_m *SSM) RemoveTagsFromResource(ctx context.Context, params *ssm.RemoveTag ret := _m.Called(_ca...) var r0 *ssm.RemoveTagsFromResourceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.RemoveTagsFromResourceInput, ...func(*ssm.Options)) (*ssm.RemoveTagsFromResourceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.RemoveTagsFromResourceInput, ...func(*ssm.Options)) *ssm.RemoveTagsFromResourceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3394,7 +3734,6 @@ func (_m *SSM) RemoveTagsFromResource(ctx context.Context, params *ssm.RemoveTag } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.RemoveTagsFromResourceInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3416,6 +3755,10 @@ func (_m *SSM) ResetServiceSetting(ctx context.Context, params *ssm.ResetService ret := _m.Called(_ca...) var r0 *ssm.ResetServiceSettingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ResetServiceSettingInput, ...func(*ssm.Options)) (*ssm.ResetServiceSettingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ResetServiceSettingInput, ...func(*ssm.Options)) *ssm.ResetServiceSettingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3424,7 +3767,6 @@ func (_m *SSM) ResetServiceSetting(ctx context.Context, params *ssm.ResetService } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ResetServiceSettingInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3446,6 +3788,10 @@ func (_m *SSM) ResumeSession(ctx context.Context, params *ssm.ResumeSessionInput ret := _m.Called(_ca...) var r0 *ssm.ResumeSessionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.ResumeSessionInput, ...func(*ssm.Options)) (*ssm.ResumeSessionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.ResumeSessionInput, ...func(*ssm.Options)) *ssm.ResumeSessionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3454,7 +3800,6 @@ func (_m *SSM) ResumeSession(ctx context.Context, params *ssm.ResumeSessionInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.ResumeSessionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3476,6 +3821,10 @@ func (_m *SSM) SendAutomationSignal(ctx context.Context, params *ssm.SendAutomat ret := _m.Called(_ca...) var r0 *ssm.SendAutomationSignalOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.SendAutomationSignalInput, ...func(*ssm.Options)) (*ssm.SendAutomationSignalOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.SendAutomationSignalInput, ...func(*ssm.Options)) *ssm.SendAutomationSignalOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3484,7 +3833,6 @@ func (_m *SSM) SendAutomationSignal(ctx context.Context, params *ssm.SendAutomat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.SendAutomationSignalInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3506,6 +3854,10 @@ func (_m *SSM) SendCommand(ctx context.Context, params *ssm.SendCommandInput, op ret := _m.Called(_ca...) var r0 *ssm.SendCommandOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.SendCommandInput, ...func(*ssm.Options)) (*ssm.SendCommandOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.SendCommandInput, ...func(*ssm.Options)) *ssm.SendCommandOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3514,7 +3866,6 @@ func (_m *SSM) SendCommand(ctx context.Context, params *ssm.SendCommandInput, op } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.SendCommandInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3536,6 +3887,10 @@ func (_m *SSM) StartAssociationsOnce(ctx context.Context, params *ssm.StartAssoc ret := _m.Called(_ca...) var r0 *ssm.StartAssociationsOnceOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartAssociationsOnceInput, ...func(*ssm.Options)) (*ssm.StartAssociationsOnceOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartAssociationsOnceInput, ...func(*ssm.Options)) *ssm.StartAssociationsOnceOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3544,7 +3899,6 @@ func (_m *SSM) StartAssociationsOnce(ctx context.Context, params *ssm.StartAssoc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.StartAssociationsOnceInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3566,6 +3920,10 @@ func (_m *SSM) StartAutomationExecution(ctx context.Context, params *ssm.StartAu ret := _m.Called(_ca...) var r0 *ssm.StartAutomationExecutionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartAutomationExecutionInput, ...func(*ssm.Options)) (*ssm.StartAutomationExecutionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartAutomationExecutionInput, ...func(*ssm.Options)) *ssm.StartAutomationExecutionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3574,7 +3932,6 @@ func (_m *SSM) StartAutomationExecution(ctx context.Context, params *ssm.StartAu } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.StartAutomationExecutionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3596,6 +3953,10 @@ func (_m *SSM) StartChangeRequestExecution(ctx context.Context, params *ssm.Star ret := _m.Called(_ca...) var r0 *ssm.StartChangeRequestExecutionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartChangeRequestExecutionInput, ...func(*ssm.Options)) (*ssm.StartChangeRequestExecutionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartChangeRequestExecutionInput, ...func(*ssm.Options)) *ssm.StartChangeRequestExecutionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3604,7 +3965,6 @@ func (_m *SSM) StartChangeRequestExecution(ctx context.Context, params *ssm.Star } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.StartChangeRequestExecutionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3626,6 +3986,10 @@ func (_m *SSM) StartSession(ctx context.Context, params *ssm.StartSessionInput, ret := _m.Called(_ca...) var r0 *ssm.StartSessionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartSessionInput, ...func(*ssm.Options)) (*ssm.StartSessionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.StartSessionInput, ...func(*ssm.Options)) *ssm.StartSessionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3634,7 +3998,6 @@ func (_m *SSM) StartSession(ctx context.Context, params *ssm.StartSessionInput, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.StartSessionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3656,6 +4019,10 @@ func (_m *SSM) StopAutomationExecution(ctx context.Context, params *ssm.StopAuto ret := _m.Called(_ca...) var r0 *ssm.StopAutomationExecutionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.StopAutomationExecutionInput, ...func(*ssm.Options)) (*ssm.StopAutomationExecutionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.StopAutomationExecutionInput, ...func(*ssm.Options)) *ssm.StopAutomationExecutionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3664,7 +4031,6 @@ func (_m *SSM) StopAutomationExecution(ctx context.Context, params *ssm.StopAuto } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.StopAutomationExecutionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3686,6 +4052,10 @@ func (_m *SSM) TerminateSession(ctx context.Context, params *ssm.TerminateSessio ret := _m.Called(_ca...) var r0 *ssm.TerminateSessionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.TerminateSessionInput, ...func(*ssm.Options)) (*ssm.TerminateSessionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.TerminateSessionInput, ...func(*ssm.Options)) *ssm.TerminateSessionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3694,7 +4064,6 @@ func (_m *SSM) TerminateSession(ctx context.Context, params *ssm.TerminateSessio } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.TerminateSessionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3716,6 +4085,10 @@ func (_m *SSM) UnlabelParameterVersion(ctx context.Context, params *ssm.UnlabelP ret := _m.Called(_ca...) var r0 *ssm.UnlabelParameterVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UnlabelParameterVersionInput, ...func(*ssm.Options)) (*ssm.UnlabelParameterVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UnlabelParameterVersionInput, ...func(*ssm.Options)) *ssm.UnlabelParameterVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3724,7 +4097,6 @@ func (_m *SSM) UnlabelParameterVersion(ctx context.Context, params *ssm.UnlabelP } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UnlabelParameterVersionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3746,6 +4118,10 @@ func (_m *SSM) UpdateAssociation(ctx context.Context, params *ssm.UpdateAssociat ret := _m.Called(_ca...) var r0 *ssm.UpdateAssociationOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateAssociationInput, ...func(*ssm.Options)) (*ssm.UpdateAssociationOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateAssociationInput, ...func(*ssm.Options)) *ssm.UpdateAssociationOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3754,7 +4130,6 @@ func (_m *SSM) UpdateAssociation(ctx context.Context, params *ssm.UpdateAssociat } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateAssociationInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3776,6 +4151,10 @@ func (_m *SSM) UpdateAssociationStatus(ctx context.Context, params *ssm.UpdateAs ret := _m.Called(_ca...) var r0 *ssm.UpdateAssociationStatusOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateAssociationStatusInput, ...func(*ssm.Options)) (*ssm.UpdateAssociationStatusOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateAssociationStatusInput, ...func(*ssm.Options)) *ssm.UpdateAssociationStatusOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3784,7 +4163,6 @@ func (_m *SSM) UpdateAssociationStatus(ctx context.Context, params *ssm.UpdateAs } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateAssociationStatusInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3806,6 +4184,10 @@ func (_m *SSM) UpdateDocument(ctx context.Context, params *ssm.UpdateDocumentInp ret := _m.Called(_ca...) var r0 *ssm.UpdateDocumentOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateDocumentInput, ...func(*ssm.Options)) (*ssm.UpdateDocumentOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateDocumentInput, ...func(*ssm.Options)) *ssm.UpdateDocumentOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3814,7 +4196,6 @@ func (_m *SSM) UpdateDocument(ctx context.Context, params *ssm.UpdateDocumentInp } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateDocumentInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3836,6 +4217,10 @@ func (_m *SSM) UpdateDocumentDefaultVersion(ctx context.Context, params *ssm.Upd ret := _m.Called(_ca...) var r0 *ssm.UpdateDocumentDefaultVersionOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateDocumentDefaultVersionInput, ...func(*ssm.Options)) (*ssm.UpdateDocumentDefaultVersionOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateDocumentDefaultVersionInput, ...func(*ssm.Options)) *ssm.UpdateDocumentDefaultVersionOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3844,7 +4229,6 @@ func (_m *SSM) UpdateDocumentDefaultVersion(ctx context.Context, params *ssm.Upd } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateDocumentDefaultVersionInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3866,6 +4250,10 @@ func (_m *SSM) UpdateDocumentMetadata(ctx context.Context, params *ssm.UpdateDoc ret := _m.Called(_ca...) var r0 *ssm.UpdateDocumentMetadataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateDocumentMetadataInput, ...func(*ssm.Options)) (*ssm.UpdateDocumentMetadataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateDocumentMetadataInput, ...func(*ssm.Options)) *ssm.UpdateDocumentMetadataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3874,7 +4262,6 @@ func (_m *SSM) UpdateDocumentMetadata(ctx context.Context, params *ssm.UpdateDoc } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateDocumentMetadataInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3896,6 +4283,10 @@ func (_m *SSM) UpdateMaintenanceWindow(ctx context.Context, params *ssm.UpdateMa ret := _m.Called(_ca...) var r0 *ssm.UpdateMaintenanceWindowOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateMaintenanceWindowInput, ...func(*ssm.Options)) (*ssm.UpdateMaintenanceWindowOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateMaintenanceWindowInput, ...func(*ssm.Options)) *ssm.UpdateMaintenanceWindowOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3904,7 +4295,6 @@ func (_m *SSM) UpdateMaintenanceWindow(ctx context.Context, params *ssm.UpdateMa } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateMaintenanceWindowInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3926,6 +4316,10 @@ func (_m *SSM) UpdateMaintenanceWindowTarget(ctx context.Context, params *ssm.Up ret := _m.Called(_ca...) var r0 *ssm.UpdateMaintenanceWindowTargetOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateMaintenanceWindowTargetInput, ...func(*ssm.Options)) (*ssm.UpdateMaintenanceWindowTargetOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateMaintenanceWindowTargetInput, ...func(*ssm.Options)) *ssm.UpdateMaintenanceWindowTargetOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3934,7 +4328,6 @@ func (_m *SSM) UpdateMaintenanceWindowTarget(ctx context.Context, params *ssm.Up } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateMaintenanceWindowTargetInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3956,6 +4349,10 @@ func (_m *SSM) UpdateMaintenanceWindowTask(ctx context.Context, params *ssm.Upda ret := _m.Called(_ca...) var r0 *ssm.UpdateMaintenanceWindowTaskOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateMaintenanceWindowTaskInput, ...func(*ssm.Options)) (*ssm.UpdateMaintenanceWindowTaskOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateMaintenanceWindowTaskInput, ...func(*ssm.Options)) *ssm.UpdateMaintenanceWindowTaskOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3964,7 +4361,6 @@ func (_m *SSM) UpdateMaintenanceWindowTask(ctx context.Context, params *ssm.Upda } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateMaintenanceWindowTaskInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -3986,6 +4382,10 @@ func (_m *SSM) UpdateManagedInstanceRole(ctx context.Context, params *ssm.Update ret := _m.Called(_ca...) var r0 *ssm.UpdateManagedInstanceRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateManagedInstanceRoleInput, ...func(*ssm.Options)) (*ssm.UpdateManagedInstanceRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateManagedInstanceRoleInput, ...func(*ssm.Options)) *ssm.UpdateManagedInstanceRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -3994,7 +4394,6 @@ func (_m *SSM) UpdateManagedInstanceRole(ctx context.Context, params *ssm.Update } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateManagedInstanceRoleInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4016,6 +4415,10 @@ func (_m *SSM) UpdateOpsItem(ctx context.Context, params *ssm.UpdateOpsItemInput ret := _m.Called(_ca...) var r0 *ssm.UpdateOpsItemOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateOpsItemInput, ...func(*ssm.Options)) (*ssm.UpdateOpsItemOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateOpsItemInput, ...func(*ssm.Options)) *ssm.UpdateOpsItemOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4024,7 +4427,6 @@ func (_m *SSM) UpdateOpsItem(ctx context.Context, params *ssm.UpdateOpsItemInput } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateOpsItemInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4046,6 +4448,10 @@ func (_m *SSM) UpdateOpsMetadata(ctx context.Context, params *ssm.UpdateOpsMetad ret := _m.Called(_ca...) var r0 *ssm.UpdateOpsMetadataOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateOpsMetadataInput, ...func(*ssm.Options)) (*ssm.UpdateOpsMetadataOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateOpsMetadataInput, ...func(*ssm.Options)) *ssm.UpdateOpsMetadataOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4054,7 +4460,6 @@ func (_m *SSM) UpdateOpsMetadata(ctx context.Context, params *ssm.UpdateOpsMetad } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateOpsMetadataInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4076,6 +4481,10 @@ func (_m *SSM) UpdatePatchBaseline(ctx context.Context, params *ssm.UpdatePatchB ret := _m.Called(_ca...) var r0 *ssm.UpdatePatchBaselineOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdatePatchBaselineInput, ...func(*ssm.Options)) (*ssm.UpdatePatchBaselineOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdatePatchBaselineInput, ...func(*ssm.Options)) *ssm.UpdatePatchBaselineOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4084,7 +4493,6 @@ func (_m *SSM) UpdatePatchBaseline(ctx context.Context, params *ssm.UpdatePatchB } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdatePatchBaselineInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4106,6 +4514,10 @@ func (_m *SSM) UpdateResourceDataSync(ctx context.Context, params *ssm.UpdateRes ret := _m.Called(_ca...) var r0 *ssm.UpdateResourceDataSyncOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateResourceDataSyncInput, ...func(*ssm.Options)) (*ssm.UpdateResourceDataSyncOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateResourceDataSyncInput, ...func(*ssm.Options)) *ssm.UpdateResourceDataSyncOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4114,7 +4526,6 @@ func (_m *SSM) UpdateResourceDataSync(ctx context.Context, params *ssm.UpdateRes } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateResourceDataSyncInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4136,6 +4547,10 @@ func (_m *SSM) UpdateServiceSetting(ctx context.Context, params *ssm.UpdateServi ret := _m.Called(_ca...) var r0 *ssm.UpdateServiceSettingOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateServiceSettingInput, ...func(*ssm.Options)) (*ssm.UpdateServiceSettingOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *ssm.UpdateServiceSettingInput, ...func(*ssm.Options)) *ssm.UpdateServiceSettingOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -4144,7 +4559,6 @@ func (_m *SSM) UpdateServiceSetting(ctx context.Context, params *ssm.UpdateServi } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *ssm.UpdateServiceSettingInput, ...func(*ssm.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -4153,3 +4567,17 @@ func (_m *SSM) UpdateServiceSetting(ctx context.Context, params *ssm.UpdateServi return r0, r1 } + +// NewSSM creates a new instance of SSM. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewSSM(t interface { + mock.TestingT + Cleanup(func()) +}) *SSM { + mock := &SSM{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/STS.go b/pkg/eks/mocksv2/STS.go index f646f3aa95..98f66be61c 100644 --- a/pkg/eks/mocksv2/STS.go +++ b/pkg/eks/mocksv2/STS.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.32.2. DO NOT EDIT. package mocksv2 @@ -26,6 +26,10 @@ func (_m *STS) AssumeRole(ctx context.Context, params *sts.AssumeRoleInput, optF ret := _m.Called(_ca...) var r0 *sts.AssumeRoleOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.AssumeRoleInput, ...func(*sts.Options)) (*sts.AssumeRoleOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.AssumeRoleInput, ...func(*sts.Options)) *sts.AssumeRoleOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -34,7 +38,6 @@ func (_m *STS) AssumeRole(ctx context.Context, params *sts.AssumeRoleInput, optF } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.AssumeRoleInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -56,6 +59,10 @@ func (_m *STS) AssumeRoleWithSAML(ctx context.Context, params *sts.AssumeRoleWit ret := _m.Called(_ca...) var r0 *sts.AssumeRoleWithSAMLOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.AssumeRoleWithSAMLInput, ...func(*sts.Options)) (*sts.AssumeRoleWithSAMLOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.AssumeRoleWithSAMLInput, ...func(*sts.Options)) *sts.AssumeRoleWithSAMLOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -64,7 +71,6 @@ func (_m *STS) AssumeRoleWithSAML(ctx context.Context, params *sts.AssumeRoleWit } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.AssumeRoleWithSAMLInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -86,6 +92,10 @@ func (_m *STS) AssumeRoleWithWebIdentity(ctx context.Context, params *sts.Assume ret := _m.Called(_ca...) var r0 *sts.AssumeRoleWithWebIdentityOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.AssumeRoleWithWebIdentityInput, ...func(*sts.Options)) (*sts.AssumeRoleWithWebIdentityOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.AssumeRoleWithWebIdentityInput, ...func(*sts.Options)) *sts.AssumeRoleWithWebIdentityOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -94,7 +104,6 @@ func (_m *STS) AssumeRoleWithWebIdentity(ctx context.Context, params *sts.Assume } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.AssumeRoleWithWebIdentityInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -116,6 +125,10 @@ func (_m *STS) DecodeAuthorizationMessage(ctx context.Context, params *sts.Decod ret := _m.Called(_ca...) var r0 *sts.DecodeAuthorizationMessageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.DecodeAuthorizationMessageInput, ...func(*sts.Options)) (*sts.DecodeAuthorizationMessageOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.DecodeAuthorizationMessageInput, ...func(*sts.Options)) *sts.DecodeAuthorizationMessageOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -124,7 +137,6 @@ func (_m *STS) DecodeAuthorizationMessage(ctx context.Context, params *sts.Decod } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.DecodeAuthorizationMessageInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -146,6 +158,10 @@ func (_m *STS) GetAccessKeyInfo(ctx context.Context, params *sts.GetAccessKeyInf ret := _m.Called(_ca...) var r0 *sts.GetAccessKeyInfoOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.GetAccessKeyInfoInput, ...func(*sts.Options)) (*sts.GetAccessKeyInfoOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.GetAccessKeyInfoInput, ...func(*sts.Options)) *sts.GetAccessKeyInfoOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -154,7 +170,6 @@ func (_m *STS) GetAccessKeyInfo(ctx context.Context, params *sts.GetAccessKeyInf } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.GetAccessKeyInfoInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -176,6 +191,10 @@ func (_m *STS) GetCallerIdentity(ctx context.Context, params *sts.GetCallerIdent ret := _m.Called(_ca...) var r0 *sts.GetCallerIdentityOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.GetCallerIdentityInput, ...func(*sts.Options)) (*sts.GetCallerIdentityOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.GetCallerIdentityInput, ...func(*sts.Options)) *sts.GetCallerIdentityOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -184,7 +203,6 @@ func (_m *STS) GetCallerIdentity(ctx context.Context, params *sts.GetCallerIdent } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.GetCallerIdentityInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -206,6 +224,10 @@ func (_m *STS) GetFederationToken(ctx context.Context, params *sts.GetFederation ret := _m.Called(_ca...) var r0 *sts.GetFederationTokenOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.GetFederationTokenInput, ...func(*sts.Options)) (*sts.GetFederationTokenOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.GetFederationTokenInput, ...func(*sts.Options)) *sts.GetFederationTokenOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -214,7 +236,6 @@ func (_m *STS) GetFederationToken(ctx context.Context, params *sts.GetFederation } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.GetFederationTokenInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -236,6 +257,10 @@ func (_m *STS) GetSessionToken(ctx context.Context, params *sts.GetSessionTokenI ret := _m.Called(_ca...) var r0 *sts.GetSessionTokenOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sts.GetSessionTokenInput, ...func(*sts.Options)) (*sts.GetSessionTokenOutput, error)); ok { + return rf(ctx, params, optFns...) + } if rf, ok := ret.Get(0).(func(context.Context, *sts.GetSessionTokenInput, ...func(*sts.Options)) *sts.GetSessionTokenOutput); ok { r0 = rf(ctx, params, optFns...) } else { @@ -244,7 +269,6 @@ func (_m *STS) GetSessionToken(ctx context.Context, params *sts.GetSessionTokenI } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, *sts.GetSessionTokenInput, ...func(*sts.Options)) error); ok { r1 = rf(ctx, params, optFns...) } else { @@ -253,3 +277,17 @@ func (_m *STS) GetSessionToken(ctx context.Context, params *sts.GetSessionTokenI return r0, r1 } + +// NewSTS creates a new instance of STS. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewSTS(t interface { + mock.TestingT + Cleanup(func()) +}) *STS { + mock := &STS{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/eks/mocksv2/generate.go b/pkg/eks/mocksv2/generate.go deleted file mode 100644 index 4d597b7dfe..0000000000 --- a/pkg/eks/mocksv2/generate.go +++ /dev/null @@ -1,3 +0,0 @@ -package mocksv2 - -//go:generate "${GOBIN}/mockery" --tags netgo --dir=../../awsapi --all --outpkg=mocksv2 --output=./ diff --git a/pkg/eks/nodegroup.go b/pkg/eks/nodegroup.go index fca5c5cdbc..c6371447b9 100644 --- a/pkg/eks/nodegroup.go +++ b/pkg/eks/nodegroup.go @@ -90,9 +90,7 @@ func LogWindowsCompatibility(nodeGroups []KubeNodeGroup, clusterMeta *api.Cluste } } -// KubeNodeGroup defines a set of Kubernetes Nodes -// -//go:generate "${GOBIN}/mockery" --name=KubeNodeGroup --output=mocks/ +// KubeNodeGroup defines a set of Kubernetes nodes. type KubeNodeGroup interface { // NameString returns the name NameString() string diff --git a/pkg/eks/nodegroup_service.go b/pkg/eks/nodegroup_service.go index 81fb914b2b..f4cb170f5c 100644 --- a/pkg/eks/nodegroup_service.go +++ b/pkg/eks/nodegroup_service.go @@ -12,6 +12,8 @@ import ( "github.com/kris-nova/logger" "github.com/pkg/errors" + ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/weaveworks/eksctl/pkg/ami" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/manager" @@ -24,14 +26,12 @@ import ( // a CloudFormation template. const maxInstanceTypes = 40 -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate - // InstanceSelector selects a set of instance types matching the specified instance selector criteria. // //counterfeiter:generate -o fakes/fake_instance_selector.go . InstanceSelector type InstanceSelector interface { // Filter returns a set of instance types matching the specified instance selector filters. - Filter(selector.Filters) ([]string, error) + Filter(context.Context, selector.Filters) ([]string, error) } // A NodeGroupService provides helpers for nodegroup creation. @@ -170,10 +170,10 @@ func (n *NodeGroupService) ExpandInstanceSelectorOptions(nodePools []api.NodePoo } func (n *NodeGroupService) expandInstanceSelector(ins *api.InstanceSelector, azs []string) ([]string, error) { - makeRange := func(val int) *selector.IntRangeFilter { - return &selector.IntRangeFilter{ - LowerBound: val, - UpperBound: val, + makeRange := func(val int) *selector.Int32RangeFilter { + return &selector.Int32RangeFilter{ + LowerBound: int32(val), + UpperBound: int32(val), } } @@ -201,9 +201,10 @@ func (n *NodeGroupService) expandInstanceSelector(ins *api.InstanceSelector, azs if cpuArch == "" { cpuArch = defaultCPUArch } - filters.CPUArchitecture = aws.String(cpuArch) - instanceTypes, err := n.instanceSelector.Filter(filters) + filters.CPUArchitecture = (*ec2types.ArchitectureType)(aws.String(cpuArch)) + + instanceTypes, err := n.instanceSelector.Filter(context.TODO(), filters) if err != nil { return nil, errors.Wrap(err, "error querying instance types for the specified instance selector criteria") } diff --git a/pkg/eks/retryer_v2.go b/pkg/eks/retryer_v2.go index 6ad509fa62..b491bb1103 100644 --- a/pkg/eks/retryer_v2.go +++ b/pkg/eks/retryer_v2.go @@ -12,6 +12,10 @@ import ( "github.com/pkg/errors" ) +const ( + maxRetries = 13 +) + // RetryerV2 implements aws.Retryer type RetryerV2 struct { aws.Retryer diff --git a/pkg/eks/services_v2.go b/pkg/eks/services_v2.go index 4a8e2a6620..22c24dafce 100644 --- a/pkg/eks/services_v2.go +++ b/pkg/eks/services_v2.go @@ -46,7 +46,7 @@ func (s *ServicesV2) STS() awsapi.STS { if s.sts == nil { s.sts = sts.NewFromConfig(s.config, func(o *sts.Options) { // Disable retryer for STS - // (see https://github.com/weaveworks/eksctl/issues/705) + // (see https://github.com/eksctl-io/eksctl/issues/705) o.Retryer = aws.NopRetryer{} }) } @@ -61,7 +61,7 @@ func (s *ServicesV2) STSPresigner() api.STSPresigner { if s.stsPresigned == nil { client := sts.NewFromConfig(s.config, func(o *sts.Options) { // Disable retryer for STS - // (see https://github.com/weaveworks/eksctl/issues/705) + // (see https://github.com/eksctl-io/eksctl/issues/705) o.Retryer = aws.NopRetryer{} }) s.stsPresigned = sts.NewPresignClient(client) @@ -158,3 +158,11 @@ func (s *ServicesV2) Outposts() awsapi.Outposts { } return s.outposts } + +func (s *ServicesV2) AWSConfig() aws.Config { + return s.config +} + +func (s *ServicesV2) CredentialsProvider() aws.CredentialsProvider { + return s.config.Credentials +} diff --git a/pkg/eks/testdata/cached-credentials.yaml b/pkg/eks/testdata/cached-credentials.yaml new file mode 100644 index 0000000000..6cac09298f --- /dev/null +++ b/pkg/eks/testdata/cached-credentials.yaml @@ -0,0 +1 @@ +# placeholder for caching credentials diff --git a/pkg/eks/update.go b/pkg/eks/update.go index 8a8594d9a5..d482d515b3 100644 --- a/pkg/eks/update.go +++ b/pkg/eks/update.go @@ -83,12 +83,7 @@ func (c *ClusterProvider) UpdateClusterConfigForLogging(ctx context.Context, cfg }, }, } - - output, err := c.AWSProvider.EKS().UpdateClusterConfig(ctx, input) - if err != nil { - return err - } - if err := c.waitForUpdateToSucceed(ctx, cfg.Metadata.Name, output.Update); err != nil { + if err := c.UpdateClusterConfig(ctx, input); err != nil { return err } @@ -147,12 +142,7 @@ func (c *ClusterProvider) UpdateClusterConfigForEndpoints(ctx context.Context, c }, } - output, err := c.AWSProvider.EKS().UpdateClusterConfig(ctx, input) - if err != nil { - return err - } - - return c.waitForUpdateToSucceed(ctx, cfg.Metadata.Name, output.Update) + return c.UpdateClusterConfig(ctx, input) } // UpdatePublicAccessCIDRs calls eks.UpdateClusterConfig and updates the CIDRs for public access @@ -163,11 +153,16 @@ func (c *ClusterProvider) UpdatePublicAccessCIDRs(ctx context.Context, clusterCo PublicAccessCidrs: clusterConfig.VPC.PublicAccessCIDRs, }, } + return c.UpdateClusterConfig(ctx, input) +} + +// UpdateClusterConfig calls EKS.UpdateClusterConfig and waits for the update to complete. +func (c *ClusterProvider) UpdateClusterConfig(ctx context.Context, input *eks.UpdateClusterConfigInput) error { output, err := c.AWSProvider.EKS().UpdateClusterConfig(ctx, input) if err != nil { return err } - return c.waitForUpdateToSucceed(ctx, clusterConfig.Metadata.Name, output.Update) + return c.waitForUpdateToSucceed(ctx, *input.Name, output.Update) } // EnableKMSEncryption enables KMS encryption for the specified cluster diff --git a/pkg/elb/cleanup.go b/pkg/elb/cleanup.go index f99713d183..69d5c9fa6a 100644 --- a/pkg/elb/cleanup.go +++ b/pkg/elb/cleanup.go @@ -199,6 +199,24 @@ func getServiceLoadBalancer(ctx context.Context, ec2API awsapi.EC2, elbAPI Descr return &lb, nil } +func getIngressELBName(hosts []string) (string, error) { + // Expected e.g. bf647c9e-default-appingres-350b-1622159649.eu-central-1.elb.amazonaws.com where AWS ALB name is + // bf647c9e-default-appingres-350b (cannot be longer than 32 characters). + hostNameParts := strings.Split(hosts[0], ".") + if len(hostNameParts[0]) == 0 { + return "", fmt.Errorf("cannot get the hostname: %v", hostNameParts) + } + name := strings.TrimPrefix(hostNameParts[0], "internal-") // Trim 'internal-' prefix for ALB DNS name which is not a part of name. + idIdx := strings.LastIndex(name, "-") + if (idIdx) != -1 { + name = name[:idIdx] // Remove the ELB ID and last hyphen at the end of the hostname (ELB name cannot end with a hyphen) + } + if len(name) > 32 { + return "", fmt.Errorf("parsed name exceeds maximum of 32 characters: %s", name) + } + return name, nil +} + func getIngressLoadBalancer(ctx context.Context, ec2API awsapi.EC2, elbAPI DescribeLoadBalancersAPI, elbv2API DescribeLoadBalancersAPIV2, clusterName string, ingress Ingress) (*loadBalancer, error) { metadata := ingress.GetMetadata() @@ -215,17 +233,12 @@ func getIngressLoadBalancer(ctx context.Context, ec2API awsapi.EC2, elbAPI Descr logger.Debug("%s is ALB Ingress, but probably not provisioned, skip", metadata.Name) return nil, nil } - // Expected e.g. bf647c9e-default-appingres-350b-1622159649.eu-central-1.elb.amazonaws.com where AWS ALB name is - // bf647c9e-default-appingres-350b (cannot be longer than 32 characters). - hostNameParts := strings.Split(hosts[0], ".") - if len(hostNameParts[0]) == 0 { - logger.Debug("%s is ALB Ingress, but probably not provisioned or something other unexpected, skip", metadata.Name) + name, err := getIngressELBName(hosts) + if err != nil { + logger.Debug("%s is ALB Ingress, but probably not provisioned or something other unexpected when getting ALB resource name, skip: %s", metadata.Name, err) return nil, nil } - name := strings.TrimPrefix(hostNameParts[0], "internal-") // Trim 'internal-' prefix for ALB DNS name which is not a part of name. - if len(name) > 32 { - name = name[:32] - } + logger.Debug("ALB resource name: %s", name) ctx, cleanup := context.WithTimeout(ctx, 30*time.Second) defer cleanup() securityGroupIDs, err := getSecurityGroupsOwnedByLoadBalancer(ctx, ec2API, elbAPI, elbv2API, clusterName, name, application) diff --git a/pkg/elb/cleanup_test.go b/pkg/elb/cleanup_test.go new file mode 100644 index 0000000000..127b84ef40 --- /dev/null +++ b/pkg/elb/cleanup_test.go @@ -0,0 +1,118 @@ +package elb + +import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("ELB Cleanup", func() { + When("Getting ingress load balancers to clean up", func() { + It("should get the right ELB hostname", func() { + + testCases := []struct { + hostname string + expected string + }{ + { + hostname: "bf647c9e-default-appingres-350b-1622159649.eu-central-1.elb.amazonaws.com", + expected: "bf647c9e-default-appingres-350b", + }, + { + hostname: "internal-k8s-default-testcase-93d8419948-541000771.us-west-2.elb.amazonaws.com", + expected: "k8s-default-testcase-93d8419948", + }, + { + hostname: "abcdefgh-default-bugfixtest-001-1356525548.us-west-2.elb.amazonaws.com", + expected: "abcdefgh-default-bugfixtest-001", + }, + { + hostname: "internal-abcdefgh-default-bugfixtest-002-541910110.us-west-2.elb.amazonaws.com", + expected: "abcdefgh-default-bugfixtest-002", + }, + { + hostname: "abcdefghijklmnopqrstuvwxyz012345-2118752702.us-west-2.elb.amazonaws.com", + expected: "abcdefghijklmnopqrstuvwxyz012345", + }, + { + hostname: "internal-abcdefghijklmnopqrstuvwxyz999999-67491582.us-west-2.elb.amazonaws.com", + expected: "abcdefghijklmnopqrstuvwxyz999999", + }, + { + hostname: "k8s-default-testcase-98cdbf582b-1474733506.us-west-2.elb.amazonaws.com", + expected: "k8s-default-testcase-98cdbf582b", + }, + { + hostname: "internal-k8s-default-testcase-fb10378931-824853021.us-west-2.elb.amazonaws.com", + expected: "k8s-default-testcase-fb10378931", + }, + { + hostname: "abcdefghijklmnopqrstuvw000-1623371943.us-west-2.elb.amazonaws.com", + expected: "abcdefghijklmnopqrstuvw000", + }, + { + hostname: "internal-abcdefghijklmnopqrstuvw001-774959707.us-west-2.elb.amazonaws.com", + expected: "abcdefghijklmnopqrstuvw001", + }, + { + hostname: "myloadbalancer-1234567890.us-west-2.elb.amazonaws.com", + expected: "myloadbalancer", + }, + { + hostname: "my-loadbalancer-1234567890.us-west-2.elb.amazonaws.com", + expected: "my-loadbalancer", + }, + } + + for _, tc := range testCases { + name, err := getIngressELBName([]string{tc.hostname}) + Expect(err).NotTo(HaveOccurred()) + Expect(name).To(Equal(tc.expected)) + } + }) + }) + + When("Getting ingress load balancers but cannot get the hostname", func() { + It("should have error", func() { + + testCases := []struct { + hostname string + }{ + { + hostname: "", + }, + { + hostname: ".us-east-1.elb.amazonaws.com", + }, + } + + for _, tc := range testCases { + _, err := getIngressELBName([]string{tc.hostname}) + Expect(err).To(HaveOccurred(), "Expected an error for hostname: %s", tc.hostname) + } + }) + }) + + When("Getting ingress load balancers but parsed ELB name exceeds 32 characters", func() { + It("should have error", func() { + + testCases := []struct { + hostname string + }{ + { + hostname: "this-is-not-an-expected-elb-resource-name.us-east-1.elb.amazonaws.com", + }, + { + hostname: "this-is-not-an-expected-elb-resource-name-1234567890.us-east-1.elb.amazonaws.com", + }, + { + hostname: "internal-this-is-not-an-expected-elb-resource-name-1234567890.us-east-1.elb.amazonaws.com", + }, + } + + for _, tc := range testCases { + _, err := getIngressELBName([]string{tc.hostname}) + Expect(err).To(HaveOccurred(), "Expected an error for hostname: %s", tc.hostname) + } + }) + }) +}) diff --git a/pkg/elb/elb_suite_test.go b/pkg/elb/elb_suite_test.go new file mode 100644 index 0000000000..d0cbede813 --- /dev/null +++ b/pkg/elb/elb_suite_test.go @@ -0,0 +1,13 @@ +package elb_test + +import ( + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +func TestElb(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Elb Suite") +} diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go index 0df88230d4..831ea39e88 100644 --- a/pkg/executor/executor.go +++ b/pkg/executor/executor.go @@ -8,8 +8,9 @@ import ( //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate -//counterfeiter:generate -o fakes/fake_executor.go . Executor // Executor executes commands shelling out and binding the stdout and stderr to the os ones +// +//counterfeiter:generate -o fakes/fake_executor.go . Executor type Executor interface { Exec(command string, args ...string) error ExecWithOut(command string, args ...string) ([]byte, error) diff --git a/pkg/flux/flux.go b/pkg/flux/flux.go index 66481fb5c4..c9b6180f19 100644 --- a/pkg/flux/flux.go +++ b/pkg/flux/flux.go @@ -14,7 +14,7 @@ import ( const ( fluxBin = "flux" - minSupportedVersion = "0.13.3" + minSupportedVersion = "0.32.0" ) type Client struct { diff --git a/pkg/flux/flux_test.go b/pkg/flux/flux_test.go index 1641852b3b..7fdce8caa3 100644 --- a/pkg/flux/flux_test.go +++ b/pkg/flux/flux_test.go @@ -90,13 +90,13 @@ var _ = Describe("Flux", func() { }) Context("checking the flux version", func() { - When("the flux version is < 0.13.3", func() { + When("the flux version is < 0.32.0", func() { BeforeEach(func() { - fakeExecutor.ExecWithOutReturns([]byte("flux version 0.13.2\n"), nil) + fakeExecutor.ExecWithOutReturns([]byte("flux version 0.31.5\n"), nil) }) It("returns an error saying older versions are not supported", func() { - Expect(fluxClient.PreFlight()).To(MatchError(ContainSubstring("found flux version 0.13.2, eksctl requires >= 0.13.3"))) + Expect(fluxClient.PreFlight()).To(MatchError(ContainSubstring("found flux version 0.31.5, eksctl requires >= 0.32.0"))) }) }) diff --git a/pkg/info/info.go b/pkg/info/info.go index 540352368e..1ead6493b1 100644 --- a/pkg/info/info.go +++ b/pkg/info/info.go @@ -3,9 +3,9 @@ package info import ( "encoding/json" "fmt" - "os/exec" "runtime" + "github.com/weaveworks/eksctl/pkg/utils/kubectl" "github.com/weaveworks/eksctl/pkg/version" ) @@ -18,16 +18,6 @@ type Info struct { OS string } -// clientVersion holds git version info of kubectl client -type clientVersion struct { - GitVersion string `json:"gitVersion"` -} - -// kubectlInfo holds version info of kubectl client -type kubectlInfo struct { - ClientVersion clientVersion `json:"clientVersion"` -} - // GetInfo returns versions info func GetInfo() Info { return Info{ @@ -42,25 +32,12 @@ func getEksctlVersion() string { return version.GetVersion() } -// getKubectlVersion returns the kubectl version func getKubectlVersion() string { - cmd := exec.Command("kubectl", "version", "--client", "--output", "json") - out, err := cmd.CombinedOutput() + clientVersion, err := kubectl.NewVersionManager().ClientVersion() if err != nil { - return fmt.Sprintf("error : %v", err) - } - - var info kubectlInfo - - if err := json.Unmarshal(out, &info); err != nil { - return fmt.Sprintf("error parsing `kubectl version` output: %v", err) + return err.Error() } - - if info.ClientVersion.GitVersion == "" { - return "unknown version" - } - - return info.ClientVersion.GitVersion + return clientVersion } // String return info as JSON diff --git a/pkg/karpenter/karpenter.go b/pkg/karpenter/karpenter.go index 0861596bd0..b80b556bc1 100644 --- a/pkg/karpenter/karpenter.go +++ b/pkg/karpenter/karpenter.go @@ -39,6 +39,7 @@ type Options struct { } // ChartInstaller defines a functionality to install Karpenter. +// //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate //counterfeiter:generate -o fakes/fake_chart_installer.go . ChartInstaller type ChartInstaller interface { diff --git a/pkg/karpenter/providers/helm.go b/pkg/karpenter/providers/helm.go index 185559e77f..25c6cee35e 100644 --- a/pkg/karpenter/providers/helm.go +++ b/pkg/karpenter/providers/helm.go @@ -9,6 +9,7 @@ import ( ) // URLGetter is an interface to support GET to the specified URL. +// //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate //counterfeiter:generate -o fakes/fake_helm_getter.go . URLGetter type URLGetter interface { @@ -28,7 +29,7 @@ type InstallChartOpts struct { } // HelmInstaller deals with setting up Helm related resources. -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +// //counterfeiter:generate -o fakes/fake_helm_installer.go . HelmInstaller type HelmInstaller interface { // InstallChart takes a releaseName's name and a chart name and installs it. If namespace is not empty diff --git a/pkg/karpenter/providers/helm/helm_test.go b/pkg/karpenter/providers/helm/helm_test.go index 2823f44189..096a29efb1 100644 --- a/pkg/karpenter/providers/helm/helm_test.go +++ b/pkg/karpenter/providers/helm/helm_test.go @@ -3,7 +3,7 @@ package helm import ( "context" "errors" - "io/ioutil" + "io" "os" "path/filepath" @@ -51,7 +51,7 @@ var _ = Describe("HelmInstaller", func() { } getters = append(getters, provider) store := storage.Init(driver.NewMemory()) - fakeKubeClient = &fakes.PrintingKubeClient{Out: ioutil.Discard} + fakeKubeClient = &fakes.PrintingKubeClient{Out: io.Discard} actionConfig = &action.Configuration{ Releases: store, KubeClient: fakeKubeClient, diff --git a/pkg/kubernetes/client.go b/pkg/kubernetes/client.go index c8a422da16..0ce16e11b4 100644 --- a/pkg/kubernetes/client.go +++ b/pkg/kubernetes/client.go @@ -497,7 +497,7 @@ func (r *RawResource) Get() (runtime.Object, bool, error) { return obj, true, nil } -//Credit https://github.com/helm/helm/issues/6910#issuecomment-601277026 +// Credit https://github.com/helm/helm/issues/6910#issuecomment-601277026 type SimpleRESTClientGetter struct { Namespace string KubeConfig string diff --git a/pkg/nodebootstrap/assets/assets.go b/pkg/nodebootstrap/assets/assets.go index 0816374ab8..4c6965618e 100644 --- a/pkg/nodebootstrap/assets/assets.go +++ b/pkg/nodebootstrap/assets/assets.go @@ -5,30 +5,37 @@ import ( _ "embed" ) -//BootstrapAl2Sh holds the bootstrap.al2.sh contents +// BootstrapAl2Sh holds the bootstrap.al2.sh contents +// //go:embed scripts/bootstrap.al2.sh var BootstrapAl2Sh string -//BootstrapHelperSh holds the bootstrap.helper.sh contents +// BootstrapHelperSh holds the bootstrap.helper.sh contents +// //go:embed scripts/bootstrap.helper.sh var BootstrapHelperSh string -//BootstrapUbuntuSh holds the bootstrap.ubuntu.sh contents +// BootstrapUbuntuSh holds the bootstrap.ubuntu.sh contents +// //go:embed scripts/bootstrap.ubuntu.sh var BootstrapUbuntuSh string -//EfaAl2Sh holds the efa.al2.sh contents +// EfaAl2Sh holds the efa.al2.sh contents +// //go:embed scripts/efa.al2.sh var EfaAl2Sh string -//EfaManagedBoothook holds the efa.managed.boothook contents +// EfaManagedBoothook holds the efa.managed.boothook contents +// //go:embed scripts/efa.managed.boothook var EfaManagedBoothook string -//InstallSsmAl2Sh holds the install-ssm.al2.sh contents +// InstallSsmAl2Sh holds the install-ssm.al2.sh contents +// //go:embed scripts/install-ssm.al2.sh var InstallSsmAl2Sh string -//KubeletYaml holds the kubelet.yaml contents +// KubeletYaml holds the kubelet.yaml contents +// //go:embed scripts/kubelet.yaml var KubeletYaml string diff --git a/pkg/nodebootstrap/powershell/powershell.go b/pkg/nodebootstrap/powershell/powershell.go new file mode 100644 index 0000000000..bef3a12f05 --- /dev/null +++ b/pkg/nodebootstrap/powershell/powershell.go @@ -0,0 +1,59 @@ +package powershell + +import ( + "fmt" + "strings" +) + +// A KeyValue holds a key-value pair. +type KeyValue struct { + Key string + Value string +} + +// FormatStringVariables formats params as PowerShell string variables. +// The caller is responsible for ensuring the keys are valid PowerShell variable names +// and the values can be surrounded by single-quoted strings. +func FormatStringVariables(params []KeyValue) string { + variables := make([]string, 0, len(params)) + for _, param := range params { + variables = append(variables, fmt.Sprintf("[string]$%s = '%s'", param.Key, param.Value)) + } + return strings.Join(variables, "\n") +} + +// JoinVariables joins the specified variables. +func JoinVariables(variables ...string) string { + return strings.Join(variables, "\n") +} + +// FormatHashTable formats table as a PowerShell hashtable. +// The caller is responsible for ensuring variableName is a valid PowerShell variable name +// and the key-value pairs can be surrounded by single-quoted strings. +func FormatHashTable(table []KeyValue, variableName string) string { + values := make([]string, 0, len(table)) + for _, kv := range table { + values = append(values, fmt.Sprintf(" '%s' = '%s'", kv.Key, kv.Value)) + } + return fmt.Sprintf("$%s = @{%s}", variableName, strings.Join(values, ";")) +} + +// FormatParams formats params into `-key "value"`, ignoring keys with empty values. +func FormatParams(params []KeyValue) string { + var args []string + for _, param := range params { + if param.Value != "" { + args = append(args, fmt.Sprintf("-%s %q", param.Key, param.Value)) + } + } + return strings.Join(args, " ") +} + +// ToCLIArgs formats params as CLI arguments. +func ToCLIArgs(params []KeyValue) string { + var args []string + for _, param := range params { + args = append(args, fmt.Sprintf("--%s=%s", param.Key, param.Value)) + } + return strings.Join(args, " ") +} diff --git a/pkg/nodebootstrap/powershell/powershell_test.go b/pkg/nodebootstrap/powershell/powershell_test.go new file mode 100644 index 0000000000..82ee51c496 --- /dev/null +++ b/pkg/nodebootstrap/powershell/powershell_test.go @@ -0,0 +1,155 @@ +package powershell_test + +import ( + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + + "github.com/weaveworks/eksctl/pkg/nodebootstrap/powershell" + "github.com/weaveworks/eksctl/pkg/testutils" +) + +func TestPowerShellUtils(t *testing.T) { + testutils.RegisterAndRun(t) +} + +var _ = Describe("PowerShell", func() { + + type powerShellEntry struct { + params []powershell.KeyValue + expectedOutput string + } + + DescribeTable("FormatStringVariables", func(e powerShellEntry) { + variables := powershell.FormatStringVariables(e.params) + Expect(variables).To(Equal(e.expectedOutput)) + }, + Entry("standard params", powerShellEntry{ + params: []powershell.KeyValue{ + { + Key: "EKSClusterName", + Value: "cluster", + }, + { + Key: "APIServerEndpoint", + Value: "https://test.com", + }, + { + Key: "Var", + Value: "Value", + }, + { + Key: "Key1", + Value: `"Value1"`, + }, + }, + expectedOutput: `[string]$EKSClusterName = 'cluster' +[string]$APIServerEndpoint = 'https://test.com' +[string]$Var = 'Value' +[string]$Key1 = '"Value1"'`, + }), + + Entry("empty params", powerShellEntry{ + expectedOutput: "", + }), + + Entry("single param", powerShellEntry{ + params: []powershell.KeyValue{ + { + Key: "EKSClusterName", + Value: "cluster", + }, + }, + expectedOutput: `[string]$EKSClusterName = 'cluster'`, + }), + ) + + DescribeTable("FormatHashTable", func(e powerShellEntry, variableName string) { + hashtable := powershell.FormatHashTable(e.params, variableName) + Expect(hashtable).To(Equal(e.expectedOutput)) + }, + + Entry("standard params", powerShellEntry{ + params: []powershell.KeyValue{ + { + Key: "node-labels", + Value: "", + }, + { + Key: "key1", + Value: "val1", + }, + { + Key: "key2", + Value: "val2", + }, + }, + expectedOutput: `$KubeletExtraArgs = @{ 'node-labels' = ''; 'key1' = 'val1'; 'key2' = 'val2'}`, + }, + "KubeletExtraArgs", + ), + + Entry( + "empty params", + powerShellEntry{ + expectedOutput: `$Map = @{}`, + }, + "Map", + ), + ) + + DescribeTable("FormatParams", func(e powerShellEntry) { + formatted := powershell.FormatParams(e.params) + Expect(formatted).To(Equal(e.expectedOutput)) + }, + Entry("standard params", powerShellEntry{ + params: []powershell.KeyValue{ + { + Key: "EKSClusterName", + Value: "cluster", + }, + { + Key: "APIServerEndpoint", + Value: "https://test.com", + }, + { + Key: "Var", + Value: "Value", + }, + }, + expectedOutput: `-EKSClusterName "cluster" -APIServerEndpoint "https://test.com" -Var "Value"`, + }), + + Entry("empty params", powerShellEntry{ + expectedOutput: "", + }), + ) + + DescribeTable("ToCLIArgs", func(e powerShellEntry) { + cliArgs := powershell.ToCLIArgs(e.params) + Expect(cliArgs).To(Equal(e.expectedOutput)) + }, + Entry("standard params", powerShellEntry{ + params: []powershell.KeyValue{ + { + Key: "node-labels", + Value: "", + }, + { + Key: "key1", + Value: "val1", + }, + { + Key: "key2", + Value: "val2", + }, + }, + expectedOutput: "--node-labels= --key1=val1 --key2=val2", + }), + + Entry("empty params", powerShellEntry{ + expectedOutput: "", + }), + ) +}) diff --git a/pkg/nodebootstrap/windows.go b/pkg/nodebootstrap/windows.go index e3e6532d6e..87be7c67a1 100644 --- a/pkg/nodebootstrap/windows.go +++ b/pkg/nodebootstrap/windows.go @@ -9,6 +9,7 @@ import ( "github.com/kris-nova/logger" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" + "github.com/weaveworks/eksctl/pkg/nodebootstrap/powershell" "github.com/weaveworks/eksctl/pkg/nodebootstrap/utils" ) @@ -18,11 +19,6 @@ type Windows struct { clusterDNS string } -type keyValue struct { - key string - value string -} - func NewWindowsBootstrapper(clusterConfig *api.ClusterConfig, np api.NodePool, clusterDNS string) *Windows { return &Windows{ clusterConfig: clusterConfig, @@ -32,106 +28,95 @@ func NewWindowsBootstrapper(clusterConfig *api.ClusterConfig, np api.NodePool, c } func (b *Windows) UserData() (string, error) { - bootstrapCommands := []string{ + ng := b.np.BaseNodeGroup() + bootstrapCommands := append([]string{ ` [string]$EKSBootstrapScriptFile = "$env:ProgramFiles\Amazon\EKS\Start-EKSBootstrap.ps1"`, + }, ng.PreBootstrapCommands...) + + if ng.OverrideBootstrapCommand != nil { + bootstrapCommands = append(bootstrapCommands, + b.makeBootstrapParams(true), + *ng.OverrideBootstrapCommand, + ) + } else { + bootstrapCommands = append(bootstrapCommands, fmt.Sprintf("& $EKSBootstrapScriptFile %s 3>&1 4>&1 5>&1 6>&1", b.makeBootstrapParams(false))) } - ng := b.np.BaseNodeGroup() - bootstrapCommands = append(bootstrapCommands, ng.PreBootstrapCommands...) - eksBootstrapCommand := fmt.Sprintf("& $EKSBootstrapScriptFile %s 3>&1 4>&1 5>&1 6>&1", b.makeBootstrapParams()) - bootstrapCommands = append(bootstrapCommands, - eksBootstrapCommand, - "", - ) + bootstrapCommands = append(bootstrapCommands, "") userData := base64.StdEncoding.EncodeToString([]byte(strings.Join(bootstrapCommands, "\n"))) - logger.Debug("user-data = %s", userData) return userData, nil } -func (b *Windows) makeBootstrapParams() string { - params := []keyValue{ +func (b *Windows) makeBootstrapParams(hasBootstrapCommand bool) string { + params := []powershell.KeyValue{ { - key: "EKSClusterName", - value: b.clusterConfig.Metadata.Name, + Key: "EKSClusterName", + Value: b.clusterConfig.Metadata.Name, }, { - key: "APIServerEndpoint", - value: b.clusterConfig.Status.Endpoint, + Key: "APIServerEndpoint", + Value: b.clusterConfig.Status.Endpoint, }, { - key: "Base64ClusterCA", - value: base64.StdEncoding.EncodeToString(b.clusterConfig.Status.CertificateAuthorityData), + Key: "Base64ClusterCA", + Value: base64.StdEncoding.EncodeToString(b.clusterConfig.Status.CertificateAuthorityData), }, { - key: "ServiceCIDR", - value: b.clusterConfig.Status.KubernetesNetworkConfig.ServiceIPv4CIDR, + Key: "ServiceCIDR", + Value: b.clusterConfig.Status.KubernetesNetworkConfig.ServiceIPv4CIDR, }, } if unmanaged, ok := b.np.(*api.NodeGroup); ok { // DNSClusterIP is only configurable for self-managed nodegroups. if b.clusterDNS != "" { - params = append(params, keyValue{ - key: "DNSClusterIP", - value: b.clusterDNS, + params = append(params, powershell.KeyValue{ + Key: "DNSClusterIP", + Value: b.clusterDNS, }) } // ContainerRuntime is only configurable for self-managed nodegroups. if unmanaged.ContainerRuntime != nil { - params = append(params, keyValue{ - key: "ContainerRuntime", - value: *unmanaged.ContainerRuntime, + params = append(params, powershell.KeyValue{ + Key: "ContainerRuntime", + Value: *unmanaged.ContainerRuntime, }) } } - params = append(params, keyValue{ - key: "KubeletExtraArgs", - value: b.makeKubeletOptions(), + kubeletOptions := b.makeKubeletOptions() + + params = append(params, powershell.KeyValue{ + Key: "KubeletExtraArgs", + Value: powershell.ToCLIArgs(kubeletOptions), }) - return formatWindowsParams(params) + + if hasBootstrapCommand { + return powershell.JoinVariables(powershell.FormatStringVariables(params), powershell.FormatHashTable(kubeletOptions, "KubeletExtraArgsMap")) + } + return powershell.FormatParams(params) } -func (b *Windows) makeKubeletOptions() string { +func (b *Windows) makeKubeletOptions() []powershell.KeyValue { ng := b.np.BaseNodeGroup() - kubeletOptions := []keyValue{ + kubeletOptions := []powershell.KeyValue{ { - key: "node-labels", - value: formatLabels(ng.Labels), + Key: "node-labels", + Value: formatLabels(ng.Labels), }, { - key: "register-with-taints", - value: utils.FormatTaints(b.np.NGTaints()), + Key: "register-with-taints", + Value: utils.FormatTaints(b.np.NGTaints()), }, } if ng.MaxPodsPerNode != 0 { - kubeletOptions = append(kubeletOptions, keyValue{ - key: "max-pods", - value: strconv.Itoa(ng.MaxPodsPerNode), + kubeletOptions = append(kubeletOptions, powershell.KeyValue{ + Key: "max-pods", + Value: strconv.Itoa(ng.MaxPodsPerNode), }) } - - return toCLIArgs(kubeletOptions) -} - -// formatWindowsParams formats params into `-key "value"`, ignoring keys with empty values -func formatWindowsParams(params []keyValue) string { - var args []string - for _, param := range params { - if param.value != "" { - args = append(args, fmt.Sprintf("-%s %q", param.key, param.value)) - } - } - return strings.Join(args, " ") -} - -func toCLIArgs(params []keyValue) string { - var args []string - for _, param := range params { - args = append(args, fmt.Sprintf("--%s=%s", param.key, param.value)) - } - return strings.Join(args, " ") + return kubeletOptions } diff --git a/pkg/nodebootstrap/windows_test.go b/pkg/nodebootstrap/windows_test.go index fb6dcd2e93..8576450790 100644 --- a/pkg/nodebootstrap/windows_test.go +++ b/pkg/nodebootstrap/windows_test.go @@ -162,6 +162,52 @@ start /wait msiexec.exe /qb /i "amazon-cloudwatch-agent.msi" [string]$EKSBootstrapScriptFile = "$env:ProgramFiles\Amazon\EKS\Start-EKSBootstrap.ps1" & $EKSBootstrapScriptFile -EKSClusterName "windohs" -APIServerEndpoint "https://test.com" -Base64ClusterCA "dGVzdA==" -ServiceCIDR "10.100.0.0/16" -DNSClusterIP "172.20.0.10" -ContainerRuntime "docker" -KubeletExtraArgs "--node-labels= --register-with-taints=" 3>&1 4>&1 5>&1 6>&1 +`, + }), + + Entry("with overrideBootstrapCommand", windowsEntry{ + updateNodeGroup: func(ng *api.NodeGroup) { + ng.OverrideBootstrapCommand = aws.String(`& $EKSBootstrapScriptFile -EKSClusterName "$EKSClusterName" -APIServerEndpoint "$APIServerEndpoint" -Base64ClusterCA "$Base64ClusterCA" -ServiceCIDR "10.100.0.0/16" -DNSClusterIP "10.100.0.10" -ContainerRuntime "containerd" -KubeletExtraArgs "$KubeletExtraArgs" 3>&1 4>&1 5>&1 6>&1`) + }, + + expectedUserData: ` + +[string]$EKSBootstrapScriptFile = "$env:ProgramFiles\Amazon\EKS\Start-EKSBootstrap.ps1" +[string]$EKSClusterName = 'windohs' +[string]$APIServerEndpoint = 'https://test.com' +[string]$Base64ClusterCA = 'dGVzdA==' +[string]$ServiceCIDR = '10.100.0.0/16' +[string]$ContainerRuntime = 'docker' +[string]$KubeletExtraArgs = '--node-labels= --register-with-taints=' +$KubeletExtraArgsMap = @{ 'node-labels' = ''; 'register-with-taints' = ''} +& $EKSBootstrapScriptFile -EKSClusterName "$EKSClusterName" -APIServerEndpoint "$APIServerEndpoint" -Base64ClusterCA "$Base64ClusterCA" -ServiceCIDR "10.100.0.0/16" -DNSClusterIP "10.100.0.10" -ContainerRuntime "containerd" -KubeletExtraArgs "$KubeletExtraArgs" 3>&1 4>&1 5>&1 6>&1 + +`, + }), + + Entry("with overrideBootstrapCommand and preBootstrapCommands", windowsEntry{ + updateNodeGroup: func(ng *api.NodeGroup) { + ng.OverrideBootstrapCommand = aws.String(`& $EKSBootstrapScriptFile -EKSClusterName "$EKSClusterName" -APIServerEndpoint "$APIServerEndpoint" -Base64ClusterCA "$Base64ClusterCA" -ServiceCIDR "10.100.0.0/16" -DNSClusterIP "10.100.0.10" -ContainerRuntime "containerd" -KubeletExtraArgs "$KubeletExtraArgs" 3>&1 4>&1 5>&1 6>&1`) + ng.PreBootstrapCommands = []string{ + `wget -UseBasicParsing -O amazon-cloudwatch-agent.msi https://s3.amazonaws.com/amazoncloudwatch-agent/windows/amd64/latest/amazon-cloudwatch-agent.msi`, + `start /wait msiexec.exe /qb /i "amazon-cloudwatch-agent.msi`, + } + }, + + expectedUserData: ` + +[string]$EKSBootstrapScriptFile = "$env:ProgramFiles\Amazon\EKS\Start-EKSBootstrap.ps1" +wget -UseBasicParsing -O amazon-cloudwatch-agent.msi https://s3.amazonaws.com/amazoncloudwatch-agent/windows/amd64/latest/amazon-cloudwatch-agent.msi +start /wait msiexec.exe /qb /i "amazon-cloudwatch-agent.msi +[string]$EKSClusterName = 'windohs' +[string]$APIServerEndpoint = 'https://test.com' +[string]$Base64ClusterCA = 'dGVzdA==' +[string]$ServiceCIDR = '10.100.0.0/16' +[string]$ContainerRuntime = 'docker' +[string]$KubeletExtraArgs = '--node-labels= --register-with-taints=' +$KubeletExtraArgsMap = @{ 'node-labels' = ''; 'register-with-taints' = ''} +& $EKSBootstrapScriptFile -EKSClusterName "$EKSClusterName" -APIServerEndpoint "$APIServerEndpoint" -Base64ClusterCA "$Base64ClusterCA" -ServiceCIDR "10.100.0.0/16" -DNSClusterIP "10.100.0.10" -ContainerRuntime "containerd" -KubeletExtraArgs "$KubeletExtraArgs" 3>&1 4>&1 5>&1 6>&1 + `, }), ) diff --git a/pkg/outposts/cluster_extender.go b/pkg/outposts/cluster_extender.go index ac155a8400..180c529f4a 100644 --- a/pkg/outposts/cluster_extender.go +++ b/pkg/outposts/cluster_extender.go @@ -31,8 +31,9 @@ type stackUpdater interface { AppendNewClusterStackResource(ctx context.Context, extendForOutposts, plan bool) (bool, error) } -//counterfeiter:generate -o fakes . ClusterToExtend // ClusterToExtend represents a cluster that needs to be extended. +// +//counterfeiter:generate -o fakes . ClusterToExtend type ClusterToExtend interface { // IsControlPlaneOnOutposts returns true if the control plane is on Outposts. IsControlPlaneOnOutposts() bool diff --git a/pkg/outposts/outposts.go b/pkg/outposts/outposts.go index 85a57d6257..aab423a766 100644 --- a/pkg/outposts/outposts.go +++ b/pkg/outposts/outposts.go @@ -98,10 +98,9 @@ func (o *Service) describeOutpostInstanceTypes(ctx context.Context) ([]ec2types. return o.instanceTypeInfoList, nil } -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate -//counterfeiter:generate -o fakes . OutpostInstance - // OutpostInstance represents an instance running on Outposts. +// +//counterfeiter:generate -o fakes . OutpostInstance type OutpostInstance interface { // SetInstanceType sets the instance type. SetInstanceType(instanceType string) diff --git a/pkg/testutils/mockprovider/mock_provider.go b/pkg/testutils/mockprovider/mock_provider.go index 0d4884b334..13efdd9011 100644 --- a/pkg/testutils/mockprovider/mock_provider.go +++ b/pkg/testutils/mockprovider/mock_provider.go @@ -1,18 +1,15 @@ package mockprovider import ( + "context" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/client" - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/awstesting" + awsv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/config" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5/fakes" "github.com/weaveworks/eksctl/pkg/awsapi" - "github.com/weaveworks/eksctl/pkg/eks/mocks" "github.com/weaveworks/eksctl/pkg/eks/mocksv2" ) @@ -27,10 +24,6 @@ var ProviderConfig = &api.ProviderConfig{ var _ api.ClusterProvider = &MockProvider{} -type MockAWSClient struct { - *client.Client -} - type MockInput struct{} type MockOutput struct { States []*MockState @@ -41,16 +34,14 @@ type MockState struct { // MockProvider stores the mocked APIs type MockProvider struct { - Client *MockAWSClient - - waitTimeout *time.Duration - region string - cfnRoleARN string - asg *mocksv2.ASG - eks *mocksv2.EKS - cloudtrail *mocksv2.CloudTrail - cloudwatchlogs *mocksv2.CloudWatchLogs - configProvider *mocks.ConfigProvider + waitTimeout *time.Duration + region string + cfnRoleARN string + asg *mocksv2.ASG + eks *mocksv2.EKS + cloudtrail *mocksv2.CloudTrail + cloudwatchlogs *mocksv2.CloudWatchLogs + credentialsProvider *mocksv2.CredentialsProvider cfn *mocksv2.CloudFormation sts *mocksv2.STS @@ -66,23 +57,22 @@ type MockProvider struct { // NewMockProvider returns a new MockProvider func NewMockProvider() *MockProvider { return &MockProvider{ - Client: NewMockAWSClient(), asg: &mocksv2.ASG{}, eks: &mocksv2.EKS{}, cloudtrail: &mocksv2.CloudTrail{}, cloudwatchlogs: &mocksv2.CloudWatchLogs{}, - configProvider: &mocks.ConfigProvider{}, - - sts: &mocksv2.STS{}, - stsPresigner: &fakes.FakeSTSPresigner{}, - cfn: &mocksv2.CloudFormation{}, - elb: &mocksv2.ELB{}, - elbV2: &mocksv2.ELBV2{}, - ssm: &mocksv2.SSM{}, - iam: &mocksv2.IAM{}, - ec2: &mocksv2.EC2{}, - outposts: &mocksv2.Outposts{}, + + sts: &mocksv2.STS{}, + stsPresigner: &fakes.FakeSTSPresigner{}, + cfn: &mocksv2.CloudFormation{}, + elb: &mocksv2.ELB{}, + elbV2: &mocksv2.ELBV2{}, + ssm: &mocksv2.SSM{}, + iam: &mocksv2.IAM{}, + ec2: &mocksv2.EC2{}, + outposts: &mocksv2.Outposts{}, + credentialsProvider: &mocksv2.CredentialsProvider{}, } } @@ -185,6 +175,14 @@ func (m MockProvider) MockCloudWatchLogs() *mocksv2.CloudWatchLogs { return m.CloudWatchLogs().(*mocksv2.CloudWatchLogs) } +func (m MockProvider) CredentialsProvider() awsv2.CredentialsProvider { + return m.credentialsProvider +} + +func (m MockProvider) MockCredentialsProvider() *mocksv2.CredentialsProvider { + return m.CredentialsProvider().(*mocksv2.CredentialsProvider) +} + // Outposts returns a representation of the Outposts API func (m MockProvider) Outposts() awsapi.Outposts { return m.outposts } @@ -221,71 +219,13 @@ func (m *MockProvider) SetWaitTimeout(t time.Duration) { m.waitTimeout = &t } -// ConfigProvider returns a representation of the ConfigProvider -func (m MockProvider) ConfigProvider() client.ConfigProvider { - return m.configProvider -} - -// MockConfigProvider returns a mocked ConfigProvider -func (m MockProvider) MockConfigProvider() client.ConfigProvider { - return m.configProvider -} - -func (m MockProvider) Session() *session.Session { - client := awstesting.NewClient(&aws.Config{ - Region: &ProviderConfig.Region, - }) - s, err := session.NewSession(&client.Config) +func (m MockProvider) AWSConfig() awsv2.Config { + options := []func(options *config.LoadOptions) error{ + config.WithRegion(ProviderConfig.Region), + } + cfg, err := config.LoadDefaultConfig(context.TODO(), options...) if err != nil { panic(err) } - return s -} - -func NewMockAWSClient() *MockAWSClient { - m := &MockAWSClient{ - Client: awstesting.NewClient(&aws.Config{ - Region: &ProviderConfig.Region, - }), - } - - m.Handlers.Send.Clear() - m.Handlers.Unmarshal.Clear() - m.Handlers.UnmarshalMeta.Clear() - m.Handlers.ValidateResponse.Clear() - - return m -} - -func (m *MockAWSClient) MockRequestForMockOutput(input *MockInput) (*request.Request, *MockOutput) { - op := &request.Operation{ - Name: "Mock", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &MockInput{} - } - - output := &MockOutput{} - req := m.NewRequest(op, input, output) - req.Data = output - return req, output -} - -func (m *MockAWSClient) MockRequestForGivenOutput(input, output interface{}) *request.Request { - op := &request.Operation{ - Name: "Mock", - HTTPMethod: "POST", - HTTPPath: "/", - } - - if input == nil { - input = &MockInput{} - } - - req := m.NewRequest(op, input, output) - req.Data = output - return req + return cfg } diff --git a/pkg/utils/instance/instance.go b/pkg/utils/instance/instance.go index e7afa4cbce..0e4ad0193b 100644 --- a/pkg/utils/instance/instance.go +++ b/pkg/utils/instance/instance.go @@ -46,6 +46,7 @@ func IsNvidiaInstanceType(instanceType string) bool { return strings.HasPrefix(instanceType, "p2") || strings.HasPrefix(instanceType, "p3") || strings.HasPrefix(instanceType, "p4") || + strings.HasPrefix(instanceType, "p5") || strings.HasPrefix(instanceType, "g3") || strings.HasPrefix(instanceType, "g4") || strings.HasPrefix(instanceType, "g5") diff --git a/pkg/utils/kubeconfig/export_test.go b/pkg/utils/kubeconfig/export_test.go index 85fd19e26f..0c94d271b6 100644 --- a/pkg/utils/kubeconfig/export_test.go +++ b/pkg/utils/kubeconfig/export_test.go @@ -1,5 +1,23 @@ package kubeconfig -func SetExecCommand(f ExecCommandFunc) { +import ( + "os/exec" + + "github.com/weaveworks/eksctl/pkg/utils/kubectl" +) + +func SetExecCommand(f func(name string, arg ...string) *exec.Cmd) { execCommand = f } + +func SetExecLookPath(f func(file string) (string, error)) { + execLookPath = f +} + +func SetNewVersionManager(f func() kubectl.KubernetesVersionManager) { + newVersionManager = f +} + +func SetLookupAuthenticator(f func() (string, bool)) { + lookupAuthenticator = f +} diff --git a/pkg/utils/kubeconfig/kubeconfig.go b/pkg/utils/kubeconfig/kubeconfig.go index b3d3736d49..077248bcb2 100644 --- a/pkg/utils/kubeconfig/kubeconfig.go +++ b/pkg/utils/kubeconfig/kubeconfig.go @@ -11,6 +11,7 @@ import ( "strings" "github.com/gofrs/flock" + "github.com/kballard/go-shellquote" "github.com/kris-nova/logger" "github.com/pkg/errors" "k8s.io/client-go/tools/clientcmd" @@ -19,6 +20,7 @@ import ( api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/utils" "github.com/weaveworks/eksctl/pkg/utils/file" + "github.com/weaveworks/eksctl/pkg/utils/kubectl" ) const ( @@ -37,9 +39,20 @@ const ( betaAPIVersion = "client.authentication.k8s.io/v1beta1" ) -type ExecCommandFunc func(name string, arg ...string) *exec.Cmd - -var execCommand = exec.Command +var ( + execCommand = exec.Command + execLookPath = exec.LookPath + newVersionManager = kubectl.NewVersionManager + lookupAuthenticator = func() (string, bool) { + for _, cmd := range authenticatorCommands() { + _, err := exec.LookPath(cmd) + if err == nil { + return cmd, true + } + } + return "", false + } +) // DefaultPath defines the default path func DefaultPath() string { @@ -49,8 +62,8 @@ func DefaultPath() string { return clientcmd.RecommendedHomeFile } -// AuthenticatorCommands returns all authenticator commands. -func AuthenticatorCommands() []string { +// authenticatorCommands returns all authenticator commands. +func authenticatorCommands() []string { return []string{ AWSIAMAuthenticator, AWSEKSAuthenticator, @@ -138,7 +151,7 @@ func NewForUser(cluster ClusterInfo, username string) *clientcmdapi.Config { // a suitable authenticator and respecting provider settings func NewForKubectl(cluster ClusterInfo, username, roleARN, profile string) *clientcmdapi.Config { config := NewForUser(cluster, username) - authenticator, found := LookupAuthenticator() + authenticator, found := lookupAuthenticator() if !found { // fall back to aws-iam-authenticator authenticator = AWSIAMAuthenticator @@ -205,9 +218,9 @@ func AppendAuthenticator(config *clientcmdapi.Config, cluster ClusterInfo, authe // kubectl 1.24.0 removes the alpha API version, so it will never work // Therefore as a best effort try the beta version even if it might not work if execConfig.APIVersion == alphaAPIVersion { - if kubectlVersion := getKubectlVersion(); kubectlVersion != "" { + if clientVersion, err := newVersionManager().ClientVersion(); err == nil { // Silently ignore errors because kubectl is not required to run eksctl - compareVersions, err := utils.CompareVersions(kubectlVersion, "1.24.0") + compareVersions, err := utils.CompareVersions(strings.TrimLeft(clientVersion, "v"), "1.24.0") if err == nil && compareVersions >= 0 { execConfig.APIVersion = betaAPIVersion } @@ -297,44 +310,6 @@ func getAWSIAMAuthenticatorVersion() (string, error) { return parsedVersion.Version, nil } -/* -KubectlVersionFormat is the format used by kubectl version --format=json, example output: - - { - "clientVersion": { - "major": "1", - "minor": "23", - "gitVersion": "v1.23.6", - "gitCommit": "ad3338546da947756e8a88aa6822e9c11e7eac22", - "gitTreeState": "archive", - "buildDate": "2022-04-29T06:39:16Z", - "goVersion": "go1.18.1", - "compiler": "gc", - "platform": "linux/amd64" - } - } -*/ -type KubectlVersionData struct { - Version string `json:"gitVersion"` -} - -type KubectlVersionFormat struct { - ClientVersion KubectlVersionData `json:"clientVersion"` -} - -func getKubectlVersion() string { - cmd := execCommand("kubectl", "version", "--client", "--output=json") - output, err := cmd.Output() - if err != nil { - return "" - } - var parsedVersion KubectlVersionFormat - if err := json.Unmarshal(output, &parsedVersion); err != nil { - return "" - } - return strings.TrimLeft(parsedVersion.ClientVersion.Version, "v") -} - func lockFileName(filePath string) string { return filepath.Join(os.TempDir(), fmt.Sprintf("%x.eksctl.lock", utils.FnvHash(filePath))) } @@ -569,13 +544,64 @@ func deleteClusterInfo(existing *clientcmdapi.Config, meta *api.ClusterMeta) boo return isChanged } -// LookupAuthenticator looks up an available authenticator -func LookupAuthenticator() (string, bool) { - for _, cmd := range AuthenticatorCommands() { - _, err := exec.LookPath(cmd) - if err == nil { - return cmd, true +// CheckAllCommands check version of kubectl, and if it can be used with either +// of the authenticator commands; most importantly it validates if kubectl can +// use kubeconfig we've created for it +func CheckAllCommands(kubeconfigPath string, isContextSet bool, contextName string, env []string) error { + authenticator, found := lookupAuthenticator() + if !found { + return fmt.Errorf("could not find any of the authenticator commands: %s", strings.Join(authenticatorCommands(), ", ")) + } + logger.Debug("found authenticator: %s", authenticator) + + kubectlPath, err := execLookPath(kubectl.Command) + if err != nil { + return fmt.Errorf("kubectl not found, v1.10.0 or newer is required") + } + logger.Debug("kubectl: %q", kubectlPath) + + vm := newVersionManager() + clientVersion, err := vm.ClientVersion() + if err != nil { + return fmt.Errorf("getting kubectl version: %w", err) + } + logger.Debug("kubectl version: %s", clientVersion) + + err = vm.ValidateVersion(clientVersion, kubectl.Client) + if err != nil { + return fmt.Errorf("validating kubectl version: %w", err) + } + + if kubeconfigPath != "" { + var args []string + if kubeconfigPath != clientcmd.RecommendedHomeFile { + args = append(args, fmt.Sprintf("--kubeconfig=%s", kubeconfigPath)) + } + if !isContextSet { + args = append(args, fmt.Sprintf("--context=%s", contextName)) } + + suggestion := fmt.Sprintf("(check '%s')", fmtCmd(append(args, "version"))) + + serverVersion, err := vm.ServerVersion(env, args) + if err != nil { + return fmt.Errorf("getting Kubernetes version on EKS cluster: %w %s", err, suggestion) + } + err = vm.ValidateVersion(serverVersion, kubectl.Server) + if err != nil { + return fmt.Errorf("validating Kubernetes version returned by EKS API: %w", err) + } + + logger.Info("kubectl command should work with %q, try '%s'", kubeconfigPath, fmtCmd(append(args, "get", "nodes"))) + } else { + logger.Debug("skipping kubectl integration checks, as writing kubeconfig file is disabled") } - return "", false + + return nil +} + +func fmtCmd(args []string) string { + cmd := []string{kubectl.Command} + cmd = append(cmd, args...) + return shellquote.Join(cmd...) } diff --git a/pkg/utils/kubeconfig/kubeconfig_test.go b/pkg/utils/kubeconfig/kubeconfig_test.go index f654e9a2d2..9d0956244b 100644 --- a/pkg/utils/kubeconfig/kubeconfig_test.go +++ b/pkg/utils/kubeconfig/kubeconfig_test.go @@ -1,6 +1,7 @@ package kubeconfig_test import ( + "fmt" "os" "os/exec" "path" @@ -9,25 +10,28 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "k8s.io/client-go/tools/clientcmd" - "k8s.io/client-go/tools/clientcmd/api" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - eksctlapi "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/utils/kubeconfig" + "github.com/weaveworks/eksctl/pkg/utils/kubectl" + + kubectlfakes "github.com/weaveworks/eksctl/pkg/utils/kubectl/fakes" + "k8s.io/client-go/tools/clientcmd" + clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) +var errGeneric = fmt.Errorf("generic error") + var _ = Describe("Kubeconfig", func() { var configFile *os.File var contextName = "test-context" - var testConfig = api.Config{ - AuthInfos: map[string]*api.AuthInfo{ + var testConfig = clientcmdapi.Config{ + AuthInfos: map[string]*clientcmdapi.AuthInfo{ "test-user": {Token: "test-token"}}, - Clusters: map[string]*api.Cluster{ + Clusters: map[string]*clientcmdapi.Cluster{ "test-cluster": {Server: "https://127.0.0.1:8443"}}, - Contexts: map[string]*api.Context{ + Contexts: map[string]*clientcmdapi.Context{ contextName: {AuthInfo: "test-user", Cluster: "test-cluster", Namespace: "test-ns"}}, CurrentContext: contextName, } @@ -314,8 +318,8 @@ var _ = Describe("Kubeconfig", func() { It("safely handles concurrent read-modify-write operations", func() { var ( - oneCluster *api.Config - twoClusters *api.Config + oneCluster *clientcmdapi.Config + twoClusters *clientcmdapi.Config ) ChangeKubeconfig() @@ -372,7 +376,16 @@ var _ = Describe("Kubeconfig", func() { Name: "name", }, } + kubeconfig.SetNewVersionManager(func() kubectl.KubernetesVersionManager { + fakeClient := &kubectlfakes.FakeKubernetesVersionManager{} + fakeClient.ClientVersionReturns("", errGeneric) + return fakeClient + }) + }) + AfterEach(func() { + kubeconfig.SetNewVersionManager(kubectl.NewVersionManager) }) + It("writes the right api version if aws-iam-authenticator version is below 0.5.3", func() { kubeconfig.SetExecCommand(func(name string, arg ...string) *exec.Cmd { return exec.Command(filepath.Join("testdata", "fake-version"), `{"Version":"0.5.1","Commit":"85e50980d9d916ae95882176c18f14ae145f916f"}`) @@ -416,18 +429,19 @@ var _ = Describe("Kubeconfig", func() { Expect(config.AuthInfos["test"].Exec.APIVersion).To(Equal("client.authentication.k8s.io/v1alpha1")) }) It("defaults to beta1 if we detect kubectl 1.24.0 or above", func() { - kubeconfig.SetExecCommand(func(name string, arg ...string) *exec.Cmd { - return exec.Command(filepath.Join("testdata", "fake-version"), `{"clientVersion": {"gitVersion": "v1.24.0"}}`) + kubeconfig.SetNewVersionManager(func() kubectl.KubernetesVersionManager { + fakeClient := &kubectlfakes.FakeKubernetesVersionManager{} + fakeClient.ClientVersionReturns("1.24.0", nil) + return fakeClient }) kubeconfig.AppendAuthenticator(config, clusterInfo, kubeconfig.AWSEKSAuthenticator, "", "") Expect(config.AuthInfos["test"].Exec.APIVersion).To(Equal("client.authentication.k8s.io/v1beta1")) }) - It("doesn't default to beta1 if we detect kubectl 1.23.0 or below", func() { - kubeconfig.SetExecCommand(func(name string, arg ...string) *exec.Cmd { - if name == "kubectl" { - return exec.Command(filepath.Join("testdata", "fake-version"), `{"clientVersion": {"gitVersion": "v1.23.6"}}`) - } - return exec.Command(filepath.Join("testdata", "fake-version"), "fail") + It("doesn't default to beta1 if we detect kubectl version lower than 1.24.0", func() { + kubeconfig.SetNewVersionManager(func() kubectl.KubernetesVersionManager { + fakeClient := &kubectlfakes.FakeKubernetesVersionManager{} + fakeClient.ClientVersionReturns("1.23.6", nil) + return fakeClient }) kubeconfig.AppendAuthenticator(config, clusterInfo, kubeconfig.AWSIAMAuthenticator, "", "") Expect(config.AuthInfos["test"].Exec.APIVersion).To(Equal("client.authentication.k8s.io/v1alpha1")) @@ -461,4 +475,155 @@ var _ = Describe("Kubeconfig", func() { Expect(config.AuthInfos["test"].Exec.APIVersion).To(Equal("client.authentication.k8s.io/v1alpha1")) }) }) + + type checkAllCommandsEntry struct { + kubeconfigPath string + mockKubernetesVersionManager func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) + overrideExecLookPath func(file string) (string, error) + overrideAuthenticatorLookupMock func() (string, bool) + expectedErr string + } + + DescribeTable("CheckAllCommands", func(e checkAllCommandsEntry) { + kubeconfig.SetExecLookPath(func(file string) (string, error) { + return "path", nil + }) + if e.overrideExecLookPath != nil { + kubeconfig.SetExecLookPath(e.overrideExecLookPath) + } + + kubeconfig.SetLookupAuthenticator(func() (string, bool) { + return kubeconfig.AWSIAMAuthenticator, true + }) + if e.overrideAuthenticatorLookupMock != nil { + kubeconfig.SetLookupAuthenticator(e.overrideAuthenticatorLookupMock) + } + + mockManagerFunc, assertFakeManagerCalls := e.mockKubernetesVersionManager() + kubeconfig.SetNewVersionManager(mockManagerFunc) + + err := kubeconfig.CheckAllCommands( + e.kubeconfigPath, + /* isContextSet */ false, + /* contextName */ "ctx-name", + /* env */ []string{"env"}, + ) + if e.expectedErr != "" { + Expect(err).To(MatchError(ContainSubstring(e.expectedErr))) + return + } + Expect(err).NotTo(HaveOccurred()) + assertFakeManagerCalls() + }, + Entry("fails to lookup authenticator", checkAllCommandsEntry{ + overrideAuthenticatorLookupMock: func() (string, bool) { + return "", false + }, + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + return mockManagerFunc, assertFakeManagerCalls + }, + expectedErr: "could not find any of the authenticator commands", + }), + + Entry("fails to lookup kubectl", checkAllCommandsEntry{ + overrideExecLookPath: func(file string) (string, error) { + return "", errGeneric + }, + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + return mockManagerFunc, assertFakeManagerCalls + }, + expectedErr: "kubectl not found, v1.10.0 or newer is required", + }), + + Entry("fails to fetch client version", checkAllCommandsEntry{ + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + fakeManager := &kubectlfakes.FakeKubernetesVersionManager{} + fakeManager.ClientVersionReturns("", errGeneric) + mockManagerFunc = func() kubectl.KubernetesVersionManager { + return fakeManager + } + return mockManagerFunc, assertFakeManagerCalls + }, + expectedErr: "getting kubectl version", + }), + + Entry("fails to validate client version", checkAllCommandsEntry{ + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + fakeManager := &kubectlfakes.FakeKubernetesVersionManager{} + fakeManager.ClientVersionReturns("v1.27.4", nil) + fakeManager.ValidateVersionReturns(errGeneric) + mockManagerFunc = func() kubectl.KubernetesVersionManager { + return fakeManager + } + return mockManagerFunc, assertFakeManagerCalls + }, + expectedErr: "validating kubectl version", + }), + + Entry("finishes successfully when kubeconfigPath is not set", checkAllCommandsEntry{ + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + fakeManager := &kubectlfakes.FakeKubernetesVersionManager{} + fakeManager.ClientVersionReturns("v1.27.4", nil) + fakeManager.ValidateVersionReturns(nil) + mockManagerFunc = func() kubectl.KubernetesVersionManager { + return fakeManager + } + assertFakeManagerCalls = func() { + Expect(fakeManager.ServerVersionCallCount()).To(Equal(0)) + } + return mockManagerFunc, assertFakeManagerCalls + }, + }), + + Entry("fails to fetch server version", checkAllCommandsEntry{ + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + fakeManager := &kubectlfakes.FakeKubernetesVersionManager{} + fakeManager.ClientVersionReturns("v1.27.4", nil) + fakeManager.ValidateVersionReturns(nil) + fakeManager.ServerVersionReturns("", errGeneric) + mockManagerFunc = func() kubectl.KubernetesVersionManager { + return fakeManager + } + return mockManagerFunc, assertFakeManagerCalls + }, + kubeconfigPath: "path", + expectedErr: "getting Kubernetes version on EKS cluster", + }), + + Entry("fails to validate server version", checkAllCommandsEntry{ + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + fakeManager := &kubectlfakes.FakeKubernetesVersionManager{} + fakeManager.ClientVersionReturns("v1.27.4", nil) + fakeManager.ValidateVersionReturnsOnCall(0, nil) + fakeManager.ServerVersionReturns("1.24.7-eks-2f45561", nil) + fakeManager.ValidateVersionReturnsOnCall(1, errGeneric) + mockManagerFunc = func() kubectl.KubernetesVersionManager { + return fakeManager + } + return mockManagerFunc, assertFakeManagerCalls + }, + kubeconfigPath: "path", + expectedErr: "validating Kubernetes version returned by EKS API", + }), + + Entry("finishes successfully when kubeconfigPath is set", checkAllCommandsEntry{ + mockKubernetesVersionManager: func() (mockManagerFunc func() kubectl.KubernetesVersionManager, assertFakeManagerCalls func()) { + fakeManager := &kubectlfakes.FakeKubernetesVersionManager{} + fakeManager.ClientVersionReturns("v1.27.4", nil) + fakeManager.ValidateVersionReturnsOnCall(0, nil) + fakeManager.ServerVersionReturns("v1.26.3", nil) + fakeManager.ValidateVersionReturnsOnCall(1, nil) + mockManagerFunc = func() kubectl.KubernetesVersionManager { + return fakeManager + } + assertFakeManagerCalls = func() { + env, args := fakeManager.ServerVersionArgsForCall(0) + Expect(env).To(Equal([]string{"env"})) + Expect(args).To(Equal([]string{"--kubeconfig=path", "--context=ctx-name"})) + } + return mockManagerFunc, assertFakeManagerCalls + }, + kubeconfigPath: "path", + }), + ) }) diff --git a/pkg/utils/kubectl/export_test.go b/pkg/utils/kubectl/export_test.go new file mode 100644 index 0000000000..da5b24cd97 --- /dev/null +++ b/pkg/utils/kubectl/export_test.go @@ -0,0 +1,7 @@ +package kubectl + +import "os/exec" + +func SetExecCommand(f func(name string, arg ...string) *exec.Cmd) { + execCommand = f +} diff --git a/pkg/utils/kubectl/fakes/fake_kubernetes_version_getter.go b/pkg/utils/kubectl/fakes/fake_kubernetes_version_getter.go new file mode 100644 index 0000000000..0c76fce132 --- /dev/null +++ b/pkg/utils/kubectl/fakes/fake_kubernetes_version_getter.go @@ -0,0 +1,274 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package fakes + +import ( + "sync" + + "github.com/weaveworks/eksctl/pkg/utils/kubectl" +) + +type FakeKubernetesVersionManager struct { + ClientVersionStub func() (string, error) + clientVersionMutex sync.RWMutex + clientVersionArgsForCall []struct { + } + clientVersionReturns struct { + result1 string + result2 error + } + clientVersionReturnsOnCall map[int]struct { + result1 string + result2 error + } + ServerVersionStub func([]string, []string) (string, error) + serverVersionMutex sync.RWMutex + serverVersionArgsForCall []struct { + arg1 []string + arg2 []string + } + serverVersionReturns struct { + result1 string + result2 error + } + serverVersionReturnsOnCall map[int]struct { + result1 string + result2 error + } + ValidateVersionStub func(string, kubectl.VersionType) error + validateVersionMutex sync.RWMutex + validateVersionArgsForCall []struct { + arg1 string + arg2 kubectl.VersionType + } + validateVersionReturns struct { + result1 error + } + validateVersionReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeKubernetesVersionManager) ClientVersion() (string, error) { + fake.clientVersionMutex.Lock() + ret, specificReturn := fake.clientVersionReturnsOnCall[len(fake.clientVersionArgsForCall)] + fake.clientVersionArgsForCall = append(fake.clientVersionArgsForCall, struct { + }{}) + stub := fake.ClientVersionStub + fakeReturns := fake.clientVersionReturns + fake.recordInvocation("ClientVersion", []interface{}{}) + fake.clientVersionMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeKubernetesVersionManager) ClientVersionCallCount() int { + fake.clientVersionMutex.RLock() + defer fake.clientVersionMutex.RUnlock() + return len(fake.clientVersionArgsForCall) +} + +func (fake *FakeKubernetesVersionManager) ClientVersionCalls(stub func() (string, error)) { + fake.clientVersionMutex.Lock() + defer fake.clientVersionMutex.Unlock() + fake.ClientVersionStub = stub +} + +func (fake *FakeKubernetesVersionManager) ClientVersionReturns(result1 string, result2 error) { + fake.clientVersionMutex.Lock() + defer fake.clientVersionMutex.Unlock() + fake.ClientVersionStub = nil + fake.clientVersionReturns = struct { + result1 string + result2 error + }{result1, result2} +} + +func (fake *FakeKubernetesVersionManager) ClientVersionReturnsOnCall(i int, result1 string, result2 error) { + fake.clientVersionMutex.Lock() + defer fake.clientVersionMutex.Unlock() + fake.ClientVersionStub = nil + if fake.clientVersionReturnsOnCall == nil { + fake.clientVersionReturnsOnCall = make(map[int]struct { + result1 string + result2 error + }) + } + fake.clientVersionReturnsOnCall[i] = struct { + result1 string + result2 error + }{result1, result2} +} + +func (fake *FakeKubernetesVersionManager) ServerVersion(arg1 []string, arg2 []string) (string, error) { + var arg1Copy []string + if arg1 != nil { + arg1Copy = make([]string, len(arg1)) + copy(arg1Copy, arg1) + } + var arg2Copy []string + if arg2 != nil { + arg2Copy = make([]string, len(arg2)) + copy(arg2Copy, arg2) + } + fake.serverVersionMutex.Lock() + ret, specificReturn := fake.serverVersionReturnsOnCall[len(fake.serverVersionArgsForCall)] + fake.serverVersionArgsForCall = append(fake.serverVersionArgsForCall, struct { + arg1 []string + arg2 []string + }{arg1Copy, arg2Copy}) + stub := fake.ServerVersionStub + fakeReturns := fake.serverVersionReturns + fake.recordInvocation("ServerVersion", []interface{}{arg1Copy, arg2Copy}) + fake.serverVersionMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeKubernetesVersionManager) ServerVersionCallCount() int { + fake.serverVersionMutex.RLock() + defer fake.serverVersionMutex.RUnlock() + return len(fake.serverVersionArgsForCall) +} + +func (fake *FakeKubernetesVersionManager) ServerVersionCalls(stub func([]string, []string) (string, error)) { + fake.serverVersionMutex.Lock() + defer fake.serverVersionMutex.Unlock() + fake.ServerVersionStub = stub +} + +func (fake *FakeKubernetesVersionManager) ServerVersionArgsForCall(i int) ([]string, []string) { + fake.serverVersionMutex.RLock() + defer fake.serverVersionMutex.RUnlock() + argsForCall := fake.serverVersionArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeKubernetesVersionManager) ServerVersionReturns(result1 string, result2 error) { + fake.serverVersionMutex.Lock() + defer fake.serverVersionMutex.Unlock() + fake.ServerVersionStub = nil + fake.serverVersionReturns = struct { + result1 string + result2 error + }{result1, result2} +} + +func (fake *FakeKubernetesVersionManager) ServerVersionReturnsOnCall(i int, result1 string, result2 error) { + fake.serverVersionMutex.Lock() + defer fake.serverVersionMutex.Unlock() + fake.ServerVersionStub = nil + if fake.serverVersionReturnsOnCall == nil { + fake.serverVersionReturnsOnCall = make(map[int]struct { + result1 string + result2 error + }) + } + fake.serverVersionReturnsOnCall[i] = struct { + result1 string + result2 error + }{result1, result2} +} + +func (fake *FakeKubernetesVersionManager) ValidateVersion(arg1 string, arg2 kubectl.VersionType) error { + fake.validateVersionMutex.Lock() + ret, specificReturn := fake.validateVersionReturnsOnCall[len(fake.validateVersionArgsForCall)] + fake.validateVersionArgsForCall = append(fake.validateVersionArgsForCall, struct { + arg1 string + arg2 kubectl.VersionType + }{arg1, arg2}) + stub := fake.ValidateVersionStub + fakeReturns := fake.validateVersionReturns + fake.recordInvocation("ValidateVersion", []interface{}{arg1, arg2}) + fake.validateVersionMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeKubernetesVersionManager) ValidateVersionCallCount() int { + fake.validateVersionMutex.RLock() + defer fake.validateVersionMutex.RUnlock() + return len(fake.validateVersionArgsForCall) +} + +func (fake *FakeKubernetesVersionManager) ValidateVersionCalls(stub func(string, kubectl.VersionType) error) { + fake.validateVersionMutex.Lock() + defer fake.validateVersionMutex.Unlock() + fake.ValidateVersionStub = stub +} + +func (fake *FakeKubernetesVersionManager) ValidateVersionArgsForCall(i int) (string, kubectl.VersionType) { + fake.validateVersionMutex.RLock() + defer fake.validateVersionMutex.RUnlock() + argsForCall := fake.validateVersionArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 +} + +func (fake *FakeKubernetesVersionManager) ValidateVersionReturns(result1 error) { + fake.validateVersionMutex.Lock() + defer fake.validateVersionMutex.Unlock() + fake.ValidateVersionStub = nil + fake.validateVersionReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeKubernetesVersionManager) ValidateVersionReturnsOnCall(i int, result1 error) { + fake.validateVersionMutex.Lock() + defer fake.validateVersionMutex.Unlock() + fake.ValidateVersionStub = nil + if fake.validateVersionReturnsOnCall == nil { + fake.validateVersionReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.validateVersionReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeKubernetesVersionManager) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.clientVersionMutex.RLock() + defer fake.clientVersionMutex.RUnlock() + fake.serverVersionMutex.RLock() + defer fake.serverVersionMutex.RUnlock() + fake.validateVersionMutex.RLock() + defer fake.validateVersionMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeKubernetesVersionManager) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ kubectl.KubernetesVersionManager = new(FakeKubernetesVersionManager) diff --git a/pkg/utils/kubectl/kubectl.go b/pkg/utils/kubectl/kubectl.go index f63ebceaee..b5c47987d1 100644 --- a/pkg/utils/kubectl/kubectl.go +++ b/pkg/utils/kubectl/kubectl.go @@ -1,101 +1,124 @@ package kubectl import ( + "encoding/json" "fmt" + "os" + "os/exec" "strings" "github.com/blang/semver" - "github.com/kballard/go-shellquote" - "github.com/kris-nova/logger" "github.com/pkg/errors" +) - "github.com/weaveworks/eksctl/pkg/utils/kubeconfig" - "github.com/weaveworks/launcher/pkg/kubectl" +const Command = "kubectl" - "k8s.io/client-go/tools/clientcmd" +var ( + versionArgs = []string{"version", "--output=json"} + execCommand = exec.Command ) -func fmtKubectlCmd(ktl *kubectl.LocalClient, cmds ...string) string { - args := []string{kubectl.Command} - args = append(args, ktl.GlobalArgs...) - args = append(args, cmds...) - return shellquote.Join(args...) +type VersionType string + +var ( + Client VersionType = "client" + Server VersionType = "server" + minClientVersion = semver.Version{ + Major: 1, + Minor: 10, + } + minServerVersion = semver.Version{ + Major: 1, + Minor: 10, + } +) + +func getMinVersionForType(vType VersionType) semver.Version { + switch vType { + case Client: + return minClientVersion + case Server: + return minServerVersion + default: + return semver.Version{ + Major: 1, + Minor: 10, + } + } +} + +// gitVersion holds git version info of kubectl client/server +type gitVersion struct { + GitVersion string `json:"gitVersion"` +} + +// kubectlInfo holds version info of kubectl client & server +type kubectlInfo struct { + ClientVersion gitVersion `json:"clientVersion"` + ServerVersion gitVersion `json:"serverVersion"` +} + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//counterfeiter:generate -o fakes/fake_kubernetes_version_getter.go . KubernetesVersionManager +type KubernetesVersionManager interface { + ClientVersion() (string, error) + ServerVersion(env []string, args []string) (string, error) + ValidateVersion(version string, vType VersionType) error +} + +// VersionManager implements KubernetesVersionManager +type VersionManager struct{} + +func NewVersionManager() KubernetesVersionManager { + return &VersionManager{} } -// checkKubectlVersion checks version of kubectl -func checkKubectlVersion(env []string) error { - ktl := &kubectl.LocalClient{Env: env} - kubectlPath, err := ktl.LookPath() +// ClientVersion returns the kubectl client version +func (vm *VersionManager) ClientVersion() (string, error) { + clientVersion, _, err := getVersion([]string{}, []string{"--client"}) if err != nil { - return fmt.Errorf("kubectl not found, v1.10.0 or newer is required") + return "", err } - logger.Debug("kubectl: %q", kubectlPath) + return clientVersion, nil +} - clientVersion, _, ignoredErr := kubectl.GetVersionInfo(ktl) - logger.Debug("kubectl version: %s", clientVersion) - if ignoredErr != nil { - logger.Debug("ignored error: %s", ignoredErr) +// ServerVersion returns the kubernetes version on server +func (vm *VersionManager) ServerVersion(env []string, args []string) (string, error) { + _, serverVersion, err := getVersion(append(os.Environ(), env...), args) + if err != nil { + return "", err } + return serverVersion, nil +} - version, err := semver.Parse(strings.TrimLeft(clientVersion, "v")) +// ValidateVersion checks that the client / server version is valid and supported +func (vm *VersionManager) ValidateVersion(version string, vType VersionType) error { + parsedVersion, err := semver.Parse(strings.TrimLeft(version, "v")) if err != nil { - if ignoredErr != nil { - return errors.Wrapf(err, "parsing kubectl version string %s (upstream error: %s) / %q", clientVersion, ignoredErr, version) - } - return errors.Wrapf(err, "parsing kubectl version string %s / %q", clientVersion, version) + return errors.Wrapf(err, "parsing kubernetes %s version string %s / %q", vType, version, parsedVersion) } - if version.Major == 1 && version.Minor < 10 { - return fmt.Errorf("kubectl version %s was found at %q, minimum required version to use EKS is v1.10.0", clientVersion, kubectlPath) + minVersion := getMinVersionForType(vType) + if parsedVersion.Compare(getMinVersionForType(vType)) < 0 { + return fmt.Errorf("kubernetes %s version %s was found, minimum required version is v%s", vType, version, minVersion) } return nil } -// CheckAllCommands check version of kubectl, and if it can be used with either -// of the authenticator commands; most importantly it validates if kubectl can -// use kubeconfig we've created for it -func CheckAllCommands(kubeconfigPath string, isContextSet bool, contextName string, env []string) error { - if err := checkKubectlVersion(env); err != nil { - return err - } +// getVersion returns the kubernetes client / server version +func getVersion(env []string, args []string) (string, string, error) { + cmd := execCommand(Command, versionArgs...) + cmd.Args = append(cmd.Args, args...) + cmd.Env = env - { - authenticator, found := kubeconfig.LookupAuthenticator() - if !found { - return fmt.Errorf("could not find any of the authenticator commands: %s", strings.Join(kubeconfig.AuthenticatorCommands(), ", ")) - } - logger.Debug("found authenticator: %s", authenticator) + out, err := cmd.Output() + if err != nil { + return "", "", fmt.Errorf("error running `kubectl version`: %w", err) } - if kubeconfigPath != "" { - ktl := &kubectl.LocalClient{ - GlobalArgs: []string{}, - Env: env, - } - if kubeconfigPath != clientcmd.RecommendedHomeFile { - ktl.GlobalArgs = append(ktl.GlobalArgs, fmt.Sprintf("--kubeconfig=%s", kubeconfigPath)) - } - if !isContextSet { - ktl.GlobalArgs = append(ktl.GlobalArgs, fmt.Sprintf("--context=%s", contextName)) - } - - suggestion := fmt.Sprintf("(check '%s')", fmtKubectlCmd(ktl, "version")) - - _, serverVersion, err := kubectl.GetVersionInfo(ktl) - if err != nil { - return errors.Wrapf(err, "unable to use kubectl with the EKS cluster %s", suggestion) - } - version, err := semver.Parse(strings.TrimLeft(serverVersion, "v")) - if err != nil { - return errors.Wrapf(err, "parsing Kubernetes version string %q return by the EKS API server", version) - } - if version.Major == 1 && version.Minor < 10 { - return fmt.Errorf("Kubernetes version %s found, v1.10.0 or newer is expected with EKS %s", serverVersion, suggestion) - } - - logger.Info("kubectl command should work with %q, try '%s'", kubeconfigPath, fmtKubectlCmd(ktl, "get", "nodes")) - } else { - logger.Debug("skipping kubectl integration checks, as writing kubeconfig file is disabled") + var info kubectlInfo + if err := json.Unmarshal(out, &info); err != nil { + return "", "", fmt.Errorf("error parsing `kubectl version` output: %w", err) } - return nil + return info.ClientVersion.GitVersion, info.ServerVersion.GitVersion, nil } diff --git a/pkg/utils/kubectl/kubectl_suite_test.go b/pkg/utils/kubectl/kubectl_suite_test.go new file mode 100644 index 0000000000..8d24d9aa11 --- /dev/null +++ b/pkg/utils/kubectl/kubectl_suite_test.go @@ -0,0 +1,11 @@ +package kubectl_test + +import ( + "testing" + + "github.com/weaveworks/eksctl/pkg/testutils" +) + +func TestUtilsKubectl(t *testing.T) { + testutils.RegisterAndRun(t) +} diff --git a/pkg/utils/kubectl/kubectl_test.go b/pkg/utils/kubectl/kubectl_test.go new file mode 100644 index 0000000000..cafd713aab --- /dev/null +++ b/pkg/utils/kubectl/kubectl_test.go @@ -0,0 +1,139 @@ +package kubectl_test + +import ( + "os/exec" + "path/filepath" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + + "github.com/weaveworks/eksctl/pkg/utils/kubectl" +) + +var _ = Describe("Kubectl", func() { + var manager kubectl.KubernetesVersionManager + // var genericError = "genericError" + + Context("GetClientVersion", func() { + + BeforeEach(func() { + manager = kubectl.NewVersionManager() + }) + AfterEach(func() { + kubectl.SetExecCommand(exec.Command) + }) + + It("should return an error if kubectl call fails", func() { + kubectl.SetExecCommand(func(name string, arg ...string) *exec.Cmd { + return exec.Command(filepath.Join("testdata", "fake-version"), `fail`) + }) + _, err := manager.ClientVersion() + Expect(err).To(MatchError(ContainSubstring("error running `kubectl version`: exit status 1"))) + }) + + It("should return an error if parsing the version fails", func() { + kubectl.SetExecCommand(func(name string, arg ...string) *exec.Cmd { + return exec.Command(filepath.Join("testdata", "fake-version"), invalidCommandOutput) + }) + _, err := manager.ClientVersion() + Expect(err).To(MatchError(ContainSubstring("error parsing `kubectl version` output"))) + }) + + It("should return the version successfully", func() { + kubectl.SetExecCommand(func(name string, arg ...string) *exec.Cmd { + return exec.Command(filepath.Join("testdata", "fake-version"), commandOutput) + }) + clientVersion, err := manager.ClientVersion() + Expect(err).NotTo(HaveOccurred()) + Expect(clientVersion).To(Equal("v1.28.1")) + }) + }) + + Context("ServerVersion", func() { + BeforeEach(func() { + manager = kubectl.NewVersionManager() + }) + AfterEach(func() { + kubectl.SetExecCommand(exec.Command) + }) + + It("should return an error if kubectl call fails", func() { + kubectl.SetExecCommand(func(name string, arg ...string) *exec.Cmd { + return exec.Command(filepath.Join("testdata", "fake-version"), `fail`) + }) + _, err := manager.ServerVersion([]string{}, []string{}) + Expect(err).To(MatchError(ContainSubstring("error running `kubectl version`: exit status 1"))) + }) + + It("should return an error if parsing the version fails", func() { + kubectl.SetExecCommand(func(name string, arg ...string) *exec.Cmd { + return exec.Command(filepath.Join("testdata", "fake-version"), invalidCommandOutput) + }) + _, err := manager.ServerVersion([]string{}, []string{}) + Expect(err).To(MatchError(ContainSubstring("error parsing `kubectl version` output"))) + }) + + It("should return the version successfully", func() { + kubectl.SetExecCommand(func(name string, arg ...string) *exec.Cmd { + return exec.Command(filepath.Join("testdata", "fake-version"), commandOutput) + }) + serverVersion, err := manager.ServerVersion([]string{}, []string{}) + Expect(err).NotTo(HaveOccurred()) + Expect(serverVersion).To(Equal("v1.24.16-eks-2d98532")) + }) + }) + + Context("ValidateVersion", func() { + BeforeEach(func() { + manager = kubectl.NewVersionManager() + }) + + It("should return an error if it fails to parse kubectl version", func() { + err := manager.ValidateVersion("", kubectl.Client) + Expect(err).To(HaveOccurred()) + Expect(err).To(MatchError(ContainSubstring("parsing kubernetes client version string"))) + }) + + It("should return an error if kubectl version is not supported", func() { + err := manager.ValidateVersion("v1.9.4", kubectl.Client) + Expect(err).To(HaveOccurred()) + Expect(err).To(MatchError(ContainSubstring("kubernetes client version v1.9.4 was found, minimum required version is v1.10.0"))) + }) + + It("should finish successfully", func() { + err := manager.ValidateVersion("v1.28.0", kubectl.Client) + Expect(err).NotTo(HaveOccurred()) + }) + }) + +}) + +var commandOutput = `{ + "clientVersion": { + "major": "1", + "minor": "28", + "gitVersion": "v1.28.1", + "gitCommit": "8dc49c4b984b897d423aab4971090e1879eb4f23", + "gitTreeState": "clean", + "buildDate": "2023-08-24T11:16:29Z", + "goVersion": "go1.20.7", + "compiler": "gc", + "platform": "darwin/arm64" + }, + "kustomizeVersion": "v5.0.4-0.20230601165947-6ce0bf390ce3", + "serverVersion": { + "major": "1", + "minor": "24+", + "gitVersion": "v1.24.16-eks-2d98532", + "gitCommit": "af930c12e26ef9d1e8fac7e3532ff4bcc1b2b509", + "gitTreeState": "clean", + "buildDate": "2023-07-28T16:52:47Z", + "goVersion": "go1.20.6", + "compiler": "gc", + "platform": "linux/amd64" + } +}` + +var invalidCommandOutput = `{ + - +}` diff --git a/pkg/utils/kubectl/testdata/fake-version b/pkg/utils/kubectl/testdata/fake-version new file mode 100755 index 0000000000..432d041ed7 --- /dev/null +++ b/pkg/utils/kubectl/testdata/fake-version @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +if [[ "${1}" == "fail" ]]; then + exit 1 +fi +echo "${1}" diff --git a/pkg/version/release.go b/pkg/version/release.go index 740d072fac..82dcd93066 100644 --- a/pkg/version/release.go +++ b/pkg/version/release.go @@ -3,7 +3,7 @@ package version // This file was generated by release_generate.go; DO NOT EDIT. // Version is the version number in semver format X.Y.Z -var Version = "0.146.0" +var Version = "0.164.0" // PreReleaseID can be empty for releases, "rc.X" for release candidates and "dev" for snapshots var PreReleaseID = "dev" diff --git a/pkg/vpc/vpc.go b/pkg/vpc/vpc.go index d96a468110..d729985e4d 100644 --- a/pkg/vpc/vpc.go +++ b/pkg/vpc/vpc.go @@ -345,7 +345,12 @@ func UseFromClusterStack(ctx context.Context, provider api.ClusterProvider, stac } } - return outputs.Collect(*stack, requiredCollectors, optionalCollectors) + if err := outputs.Collect(*stack, requiredCollectors, optionalCollectors); err != nil { + return err + } + // to clean up invalid subnets based on AZ after importing valid subnets from stack + cleanupSubnets(spec) + return nil } // MakeExtendedSubnetAliasFunc returns a function for creating an alias for a subnet that was added as part of extending @@ -428,6 +433,13 @@ func ImportSubnets(ctx context.Context, ec2API awsapi.EC2, spec *api.ClusterConf } } + // as subnetMapping will be populated / altered within ImportSubnet, + // we want to keep an unchanged copy for local against remote VPC config validation + localSubnetConfig := api.AZSubnetMapping{} + for k, v := range subnetMapping { + localSubnetConfig[k] = v + } + for _, sn := range subnets { if spec.VPC.ID == "" { // if VPC wasn't defined, import it based on VPC of the first @@ -439,7 +451,7 @@ func ImportSubnets(ctx context.Context, ec2API awsapi.EC2, spec *api.ClusterConf return fmt.Errorf("given %s is in %s, not in %s", *sn.SubnetId, *sn.VpcId, spec.VPC.ID) } - if err := api.ImportSubnet(subnetMapping, &sn, makeSubnetAlias); err != nil { + if err := api.ImportSubnet(subnetMapping, localSubnetConfig, &sn, makeSubnetAlias); err != nil { return fmt.Errorf("could not import subnet %s: %w", *sn.SubnetId, err) } spec.AppendAvailabilityZone(*sn.AvailabilityZone) @@ -640,6 +652,14 @@ func cleanupSubnets(spec *api.ClusterConfig) { cleanup := func(subnets *api.AZSubnetMapping) { for name, subnet := range *subnets { if _, ok := availabilityZones[subnet.AZ]; !ok { + // since we're removing the subnet with invalid AZ from spec, we want to reference it by ID in any subsequent nodegroup creation task + for _, node := range nodes.ToNodePools(spec) { + for i, subnetRef := range node.BaseNodeGroup().Subnets { + if subnetRef == name { + node.BaseNodeGroup().Subnets[i] = subnet.ID + } + } + } delete(*subnets, name) } } diff --git a/pkg/vpc/vpc_test.go b/pkg/vpc/vpc_test.go index 210c66f36c..63970f803b 100644 --- a/pkg/vpc/vpc_test.go +++ b/pkg/vpc/vpc_test.go @@ -106,6 +106,15 @@ func newFakeClusterWithEndpoints(private, public bool, name string) *ekstypes.Cl return cluster } +func clusterConfigWithSubnets(publicSubnets, privateSubnets api.AZSubnetMapping) *api.ClusterConfig { + cfg := api.NewClusterConfig() + cfg.VPC.Subnets = &api.ClusterSubnets{ + Private: privateSubnets, + Public: publicSubnets, + } + return cfg +} + var _ = Describe("VPC", func() { Describe("SplitInto16", func() { It("splits the block into 16", func() { @@ -597,6 +606,113 @@ var _ = Describe("VPC", func() { }, nil) }, }), + + Entry("cluster spec provided - subnets with invalid AZs", useFromClusterCase{ + cfg: clusterConfigWithSubnets( + api.AZSubnetMapping{ + "public-1": { + ID: "subnet-public-1", + }, + // public-2 will not be on the stack, + // hence fetching config from stack + // won't resolve the AZ for this subnet + "public-2": { + ID: "subnet-public-2", + }, + }, + api.AZSubnetMapping{ + "private-1": { + ID: "subnet-private-1", + }, + // private-2 will not be on the stack, + // hence fetching config from stack + // won't resolve the AZ for this subnet + "private-2": { + ID: "subnet-private-2", + }, + }), + stack: &cfntypes.Stack{ + Outputs: []cfntypes.Output{ + { + OutputKey: aws.String("VPC"), + OutputValue: aws.String("vpc-123"), + }, + { + OutputKey: aws.String("SecurityGroup"), + OutputValue: aws.String("sg-123"), + }, + { + OutputKey: aws.String("SubnetsPublic"), + OutputValue: aws.String("subnet-public-1"), + }, + { + OutputKey: aws.String("SubnetsPrivate"), + OutputValue: aws.String("subnet-private-1"), + }, + }, + }, + mockEC2: func(ec2Mock *mocksv2.EC2) { + ec2Mock.On("DescribeSubnets", Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { + subnet := ec2types.Subnet{ + SubnetId: aws.String(input.SubnetIds[0]), + VpcId: aws.String("vpc-123"), + } + if input.SubnetIds[0] == "subnet-public-1" { + subnet.AvailabilityZone = aws.String("us-west-2a") + subnet.CidrBlock = aws.String("192.168.0.0/20") + } else { + subnet.AvailabilityZone = aws.String("us-west-2a") + subnet.CidrBlock = aws.String("192.168.0.16/20") + } + return &ec2.DescribeSubnetsOutput{ + Subnets: []ec2types.Subnet{subnet}, + } + }, nil).On("DescribeVpcs", Anything, Anything).Return(&ec2.DescribeVpcsOutput{ + Vpcs: []ec2types.Vpc{ + { + VpcId: aws.String("vpc-123"), + CidrBlock: aws.String("192.168.0.0/20"), + }, + }, + }, nil) + }, + expectedVPC: &api.ClusterVPC{ + Network: api.Network{ + ID: "vpc-123", + CIDR: ipnet.MustParseCIDR("192.168.0.0/20"), + }, + SecurityGroup: "sg-123", + Subnets: &api.ClusterSubnets{ + Public: api.AZSubnetMapping{ + "public-1": api.AZSubnetSpec{ + ID: "subnet-public-1", + AZ: "us-west-2a", + CIDR: ipnet.MustParseCIDR("192.168.0.0/20"), + }, + }, + Private: api.AZSubnetMapping{ + "private-1": api.AZSubnetSpec{ + ID: "subnet-private-1", + AZ: "us-west-2a", + CIDR: ipnet.MustParseCIDR("192.168.0.16/20"), + }, + }, + }, + LocalZoneSubnets: &api.ClusterSubnets{ + Private: api.NewAZSubnetMapping(), + Public: api.NewAZSubnetMapping(), + }, + ManageSharedNodeSecurityGroupRules: aws.Bool(true), + AutoAllocateIPv6: aws.Bool(false), + NAT: &api.ClusterNAT{ + Gateway: aws.String("Single"), + }, + ClusterEndpoints: &api.ClusterEndpoints{ + PublicAccess: aws.Bool(true), + PrivateAccess: aws.Bool(true), + }, + }, + }), ) DescribeTable("importVPC", @@ -875,10 +991,54 @@ var _ = Describe("VPC", func() { AvailabilityZones: []string{"az1", "az2", "az3"}, } + cfgWithAllAZAndNGs := &api.ClusterConfig{ + NodeGroups: []*api.NodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Subnets: []string{"invalid id"}, + }, + }, + }, + ManagedNodeGroups: []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Subnets: []string{"invalid id"}, + }, + }, + }, + VPC: &api.ClusterVPC{ + Subnets: &api.ClusterSubnets{ + Private: api.AZSubnetMappingFromMap(map[string]api.AZSubnetSpec{ + "az1": { + ID: "private1", + }, + "az2": { + ID: "private2", + }, + "az3": { + ID: "private3", + }, + }), + Public: api.AZSubnetMappingFromMap(map[string]api.AZSubnetSpec{ + "az1": { + ID: "public1", + }, + "az2": { + ID: "public2", + }, + "az3": { + ID: "public3", + }, + }), + }, + }, + AvailabilityZones: []string{"az1", "az2", "az3"}, + } + DescribeTable("clean up the subnets details in spec if given AZ is invalid", func(e cleanupSubnetsCase) { cleanupSubnets(e.cfg) - Expect(e.cfg).To(Equal(cfgWithAllAZ)) + Expect(e.cfg).To(Equal(e.want)) }, Entry("All AZs are valid", cleanupSubnetsCase{ @@ -911,10 +1071,25 @@ var _ = Describe("VPC", func() { }, AvailabilityZones: []string{"az1", "az2", "az3"}, }, + want: cfgWithAllAZ, }), Entry("Private subnet with invalid AZ", cleanupSubnetsCase{ cfg: &api.ClusterConfig{ + NodeGroups: []*api.NodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Subnets: []string{"invalid AZ"}, + }, + }, + }, + ManagedNodeGroups: []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Subnets: []string{"invalid AZ"}, + }, + }, + }, VPC: &api.ClusterVPC{ Subnets: &api.ClusterSubnets{ Private: api.AZSubnetMappingFromMap(map[string]api.AZSubnetSpec{ @@ -928,7 +1103,7 @@ var _ = Describe("VPC", func() { ID: "private3", }, "invalid AZ": { - ID: "invalid private id", + ID: "invalid id", }, }), Public: api.AZSubnetMappingFromMap(map[string]api.AZSubnetSpec{ @@ -946,10 +1121,24 @@ var _ = Describe("VPC", func() { }, AvailabilityZones: []string{"az1", "az2", "az3"}, }, - want: cfgWithAllAZ, + want: cfgWithAllAZAndNGs, }), Entry("Public subnet with invalid AZ", cleanupSubnetsCase{ cfg: &api.ClusterConfig{ + NodeGroups: []*api.NodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Subnets: []string{"invalid AZ"}, + }, + }, + }, + ManagedNodeGroups: []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Subnets: []string{"invalid AZ"}, + }, + }, + }, VPC: &api.ClusterVPC{ Subnets: &api.ClusterSubnets{ Private: api.AZSubnetMappingFromMap(map[string]api.AZSubnetSpec{ @@ -974,14 +1163,14 @@ var _ = Describe("VPC", func() { ID: "public3", }, "invalid AZ": { - ID: "invalid public id", + ID: "invalid id", }, }), }, }, AvailabilityZones: []string{"az1", "az2", "az3"}, }, - want: cfgWithAllAZ, + want: cfgWithAllAZAndNGs, }), ) diff --git a/tools.go b/tools.go index 71ecfe3646..9858638e78 100644 --- a/tools.go +++ b/tools.go @@ -12,7 +12,7 @@ import ( _ "github.com/goreleaser/goreleaser" _ "github.com/maxbrunsfeld/counterfeiter/v6" _ "github.com/vburenin/ifacemaker" - _ "github.com/vektra/mockery/cmd/mockery" + _ "github.com/vektra/mockery/v2" _ "golang.org/x/tools/cmd/stringer" _ "k8s.io/code-generator/cmd/client-gen" _ "k8s.io/code-generator/cmd/deepcopy-gen" diff --git a/userdocs/src/README.md b/userdocs/README.md similarity index 100% rename from userdocs/src/README.md rename to userdocs/README.md diff --git a/userdocs/mkdocs.yml b/userdocs/mkdocs.yml index d0344583dd..66ac005bfa 100644 --- a/userdocs/mkdocs.yml +++ b/userdocs/mkdocs.yml @@ -2,10 +2,11 @@ site_name: eksctl site_description: 'The official CLI for Amazon EKS' site_author: 'eksctl authors' +site_url: https://eksctl.io # Repository -repo_name: 'weaveworks/eksctl' -repo_url: 'https://github.com/weaveworks/eksctl' +repo_name: 'eksctl-io/eksctl' +repo_url: 'https://github.com/eksctl-io/eksctl' docs_dir: src edit_uri: "" @@ -13,8 +14,8 @@ edit_uri: "" theme: name: 'material' custom_dir: 'theme' - favicon: 'assets/images/favicon.png' - logo: 'assets/images/logo.png' + favicon: 'img/favicon.png' + logo: 'img/logo.png' font: text: 'Segoe UI' code: 'Roboto Mono' @@ -22,9 +23,9 @@ theme: - media: "(prefers-color-scheme: light)" scheme: default toggle: - icon: fontawesome/solid/moon + icon: material/weather-night name: Switch to dark mode - primary: white + primary: black accent: indigo - media: "(prefers-color-scheme: dark)" scheme: slate @@ -43,6 +44,8 @@ theme: - navigation.instant - navigation.sections - navigation.top + - navigation.tabs + - navigation.tabs.sticky - search.highlight - search.share - search.suggest @@ -57,6 +60,9 @@ plugins: - glightbox - minify: minify_html: true + - social: + cards: true + cards_font: Roboto # Customization extra: @@ -73,12 +79,39 @@ extra: link: https://www.youtube.com/c/WeaveWorksInc analytics: provider: google - property: G-EQKYCQY5Q + property: G-EQKYCQY5Q2 + feedback: + title: Was this page helpful? + ratings: + - icon: material/thumb-up-outline + name: This page was helpful + data: 1 + note: >- + Thanks for your feedback! + - icon: material/thumb-down-outline + name: This page could be improved + data: 0 + note: >- + Thanks for your feedback! Help us improve this page by using our + feedback form . + consent: + title: Cookie consent + description: >- + We use cookies to recognize your repeated visits and preferences, as well as to measure the effectiveness of our documentation and whether users + find what they're searching for. With your consent, you're helping us to make our documentation better. + actions: + - accept + - manage extra_css: - stylesheets/extra.css - stylesheets/schema.css +extra_javascript: + - https://cdn.jsdelivr.net/npm/@glidejs/glide + - https://cdnjs.cloudflare.com/ajax/libs/axios/0.21.1/axios.min.js + - javascripts/extra.js + # Extensions markdown_extensions: - toc: @@ -90,68 +123,75 @@ markdown_extensions: - pymdownx.details - pymdownx.tasklist: custom_checkbox: true + - pymdownx.emoji: + emoji_index: !!python/name:materialx.emoji.twemoji + emoji_generator: !!python/name:materialx.emoji.to_svg - attr_list - md_in_html # Page tree nav: - - Introduction: introduction.md + - Home: index.md + - Getting Started: + - Introduction: getting-started.md + - Installation: installation.md + - Announcements: + - announcements/managed-nodegroups-announcement.md + - announcements/nodegroup-override-announcement.md - Usage: - - Clusters: - - usage/creating-and-managing-clusters.md - - usage/outposts.md - - usage/unowned-clusters.md - - usage/eks-connector.md - - usage/customizing-the-kubelet.md - - usage/cloudwatch-cluster-logging.md - - usage/eks-private-cluster.md - - usage/addons.md - - usage/emr-access.md - - usage/fargate-support.md - - usage/cluster-upgrade.md - - usage/addon-upgrade.md - - Nodegroups: - - usage/managing-nodegroups.md - - usage/nodegroup-upgrade.md - - usage/nodegroup-with-custom-subnet.md - - usage/nodegroup-customize-dns.md - - usage/nodegroup-taints.md - - usage/eks-managed-nodes.md - - usage/launch-template-support.md - - usage/instance-selector.md - - usage/spot-instances.md - - usage/gpu-support.md - - usage/arm-support.md - - usage/autoscaling.md - - usage/custom-ami-support.md - - usage/container-runtime.md - - usage/windows-worker-nodes.md - - usage/nodegroup-additional-volume-mappings.md - - GitOps: - - usage/gitops-v2.md - - Security: - - usage/security.md - - usage/kms-encryption.md - - Networking: - - usage/vpc-networking.md - - usage/vpc-configuration.md - - usage/vpc-subnet-settings.md - - usage/vpc-cluster-access.md - - usage/vpc-ip-family.md - - IAM: - - usage/minimum-iam-policies.md - - usage/iam-permissions-boundary.md - - usage/iam-policies.md - - usage/iam-identity-mappings.md - - usage/iamserviceaccounts.md - - usage/dry-run.md - - usage/schema.md - - usage/eksctl-anywhere.md - - usage/eksctl-karpenter.md - - usage/troubleshooting.md - - FAQ: usage/faq.md - - Announcements: - - announcements/managed-nodegroups-announcement.md - - announcements/nodegroup-override-announcement.md - - Examples: "https://github.com/weaveworks/eksctl/tree/main/examples" + - Clusters: + - usage/creating-and-managing-clusters.md + - usage/outposts.md + - usage/unowned-clusters.md + - usage/eks-connector.md + - usage/customizing-the-kubelet.md + - usage/cloudwatch-cluster-logging.md + - usage/eks-private-cluster.md + - usage/addons.md + - usage/emr-access.md + - usage/fargate-support.md + - usage/cluster-upgrade.md + - usage/addon-upgrade.md + - Nodegroups: + - usage/managing-nodegroups.md + - usage/nodegroup-upgrade.md + - usage/nodegroup-with-custom-subnet.md + - usage/nodegroup-customize-dns.md + - usage/nodegroup-taints.md + - usage/eks-managed-nodes.md + - usage/launch-template-support.md + - usage/instance-selector.md + - usage/spot-instances.md + - usage/gpu-support.md + - usage/arm-support.md + - usage/autoscaling.md + - usage/custom-ami-support.md + - usage/container-runtime.md + - usage/windows-worker-nodes.md + - usage/nodegroup-additional-volume-mappings.md + - GitOps: + - usage/gitops-v2.md + - Security: + - usage/security.md + - usage/kms-encryption.md + - Networking: + - usage/vpc-networking.md + - usage/vpc-configuration.md + - usage/vpc-subnet-settings.md + - usage/vpc-cluster-access.md + - usage/vpc-ip-family.md + - IAM: + - usage/minimum-iam-policies.md + - usage/iam-permissions-boundary.md + - usage/iam-policies.md + - usage/iam-identity-mappings.md + - usage/iamserviceaccounts.md + - usage/dry-run.md + - usage/schema.md + - usage/eksctl-anywhere.md + - usage/eksctl-karpenter.md + - usage/troubleshooting.md + - FAQ: usage/faq.md + - Examples: "https://github.com/eksctl-io/eksctl/tree/main/examples" - Community: community.md + - Adopters: adopters.md diff --git a/userdocs/requirements.txt b/userdocs/requirements.txt index b431435ec6..6502bb7938 100644 --- a/userdocs/requirements.txt +++ b/userdocs/requirements.txt @@ -1,12 +1,14 @@ -mkdocs == 1.4.2 -mkdocs-material == 9.0.6 +mkdocs == 1.5.2 +mkdocs-material == 9.2.7 mkdocs-redirects mkdocs-minify-plugin mkdocs-glightbox pymdown-extensions >= 9.9.1 jinja2 == 3.1.2 +pillow +cairosvg # Dependencies from material theme mkdocs-material-extensions>=1.1 pygments>=2.12 -markdown>=3.2 +markdown>=3.2 \ No newline at end of file diff --git a/userdocs/src/adopters.md b/userdocs/src/adopters.md new file mode 100644 index 0000000000..efe0b8c5f8 --- /dev/null +++ b/userdocs/src/adopters.md @@ -0,0 +1,19 @@ +--- +hide: + - navigation +--- +# eksctl Adopters :fontawesome-solid-handshake-simple: + +Are you and your organisation using `eksctl`? +We would love to hear from you! :octicons-heart-fill-24:{ .heart } + +Get featured on our [website](/), follow the instructions below. + +- Follow the [contributions guide](https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#developing-eksctl) to fork the `eksctl` repository. +- Add your company logo to the folder `/userdocs/theme/assets/adopters/`. The logo image should be either `.png`, `.jpg` or `.svg` format. Max width and height should be 150px. +The logo image must be named after your organisation for eg., If your organisation name is Acme Corp then your logo image should be named `acme-logo.png`. +- Edit `/userdocs/theme/partials/copyright.html` file and add a new `li` element with your logo details above the line ``. +Following the example of the Acme Corp, new list element will be `
  • Acme Corp
    • `. +- Commit your changes, follow the [PR submission guidelines](https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#pr-submission-guidelines) and open a +Pull Request in `eksctl` [repository](https://github.com/eksctl-io/eksctl). +- We will happily review your contribution. :fontawesome-solid-wand-magic-sparkles: diff --git a/userdocs/src/announcements/managed-nodegroups-announcement.md b/userdocs/src/announcements/managed-nodegroups-announcement.md index 30b23b65ef..c3f9ec3168 100644 --- a/userdocs/src/announcements/managed-nodegroups-announcement.md +++ b/userdocs/src/announcements/managed-nodegroups-announcement.md @@ -1,6 +1,6 @@ # Managed Nodegroups Default -As of [eksctl v0.58.0](https://github.com/weaveworks/eksctl/releases/tag/0.58.0), eksctl creates managed nodegroups by +As of [eksctl v0.58.0](https://github.com/eksctl-io/eksctl/releases/tag/0.58.0), eksctl creates managed nodegroups by default when a `ClusterConfig` file isn't specified for `eksctl create cluster` and `eksctl create nodegroup`. To create a self-managed nodegroup, pass `--managed=false`. This may break scripts not using a config file if a feature not supported in managed nodegroups, e.g., Windows nodegroups, is being used. diff --git a/userdocs/src/announcements/nodegroup-override-announcement.md b/userdocs/src/announcements/nodegroup-override-announcement.md index 70f2f820b8..465b6126d3 100644 --- a/userdocs/src/announcements/nodegroup-override-announcement.md +++ b/userdocs/src/announcements/nodegroup-override-announcement.md @@ -1,11 +1,11 @@ # Nodegroup Bootstrap Override For Custom AMIs -This change was announced in the issue [Breaking: overrideBootstrapCommand soon...](https://github.com/weaveworks/eksctl/issues/3563). -Now, it has come to pass in [this](https://github.com/weaveworks/eksctl/pull/4968) PR. Please read the attached issue carefully about +This change was announced in the issue [Breaking: overrideBootstrapCommand soon...](https://github.com/eksctl-io/eksctl/issues/3563). +Now, it has come to pass in [this](https://github.com/eksctl-io/eksctl/pull/4968) PR. Please read the attached issue carefully about why we decided to move away from supporting custom AMIs without bootstrap scripts or with partial bootstrap scripts. -We still provide a helper! Migrating hopefully is not that painful. `eksctl` still provides a script, which when sourced, -will export a couple of helpful environment properties and settings. This script is located [here](https://github.com/weaveworks/eksctl/blob/70a289d62e3c82e6177930cf2469c2572c82e104/pkg/nodebootstrap/assets/scripts/bootstrap.helper.sh). +We still provide a helper! Migrating hopefully is not that painful. `eksctl` still provides a script, which when sourced, +will export a couple of helpful environment properties and settings. This script is located [here](https://github.com/eksctl-io/eksctl/blob/70a289d62e3c82e6177930cf2469c2572c82e104/pkg/nodebootstrap/assets/scripts/bootstrap.helper.sh). The following environment properties will be at your disposal: diff --git a/userdocs/src/community.md b/userdocs/src/community.md index 7b2d5d51b7..b15fcaf31e 100644 --- a/userdocs/src/community.md +++ b/userdocs/src/community.md @@ -1,16 +1,23 @@ +--- +hide: + - navigation +--- +# eksctl Community :fontawesome-solid-people-group: + +We welcome contributions from the community. :octicons-heart-fill-24:{ .heart } For more information, please head to our [Community][community] and [Contributing][contributing] docs in Github. -[community]: https://github.com/weaveworks/eksctl/blob/main/COMMUNITY.md -[contributing]: https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md +[community]: https://github.com/eksctl-io/eksctl/blob/main/COMMUNITY.md +[contributing]: https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md -## Get in touch +## Get in touch :simple-wechat: -[Create an issue](https://github.com/weaveworks/eksctl/issues/new), or login to [Weave Community Slack (#eksctl)][slackchan] ([signup][slackjoin]). +[Create an issue](https://github.com/eksctl-io/eksctl/issues/new), or login to [Eksctl Slack (#eksctl)][slackchan] ([signup][slackjoin]). -[slackjoin]: https://slack.weave.works/ -[slackchan]: https://weave-community.slack.com/messages/CAYBZBWGL/ +[slackjoin]: https://slack.k8s.io/ +[slackchan]: https://slack.k8s.io/messages/eksctl/ -## Release Cadence +## Release Cadence :material-clipboard-check-multiple-outline: Minor releases of `eksctl` are loosely scheduled for weekly on Fridays. Patch releases will be made available as needed. @@ -18,6 +25,10 @@ releases will be made available as needed. One or more release candidate(s) (RC) builds will be made available prior to each minor release. RC builds are intended only for testing purposes. +## Eksctl Roadmap :octicons-project-roadmap-16: + +The EKS section of the AWS Containers Roadmap contains the overall roadmap for EKS. All the upcoming features for `eksctl` built in partnership with AWS can be found [here](https://github.com/aws/containers-roadmap/projects/1?card_filter_query=label%3Aeks). + ## 2021 Roadmap The following are the features/epics we will focus on and hope to ship this year. @@ -26,7 +37,7 @@ General maintenance of `eksctl` is still implied alongside this work, but all subsequent features which are suggested during the year will be weighed in relation to the core targets. -Progress on the roadmap can be tracked [here](https://github.com/weaveworks/eksctl/projects/2). +Progress on the roadmap can be tracked [here](https://github.com/eksctl-io/eksctl/projects/2). ### Technical Debt @@ -34,8 +45,8 @@ Not a feature, but a vital pre-requisite to making actual feature work straightf Key aims within this goal include, but are not limited to: -- [Refactoring/simplifying the Provider](https://github.com/weaveworks/eksctl/issues/2931) -- [Expose core `eksctl` workflows through a library/SDK](https://github.com/weaveworks/eksctl/issues/813) +- [Refactoring/simplifying the Provider](https://github.com/eksctl-io/eksctl/issues/2931) +- [Expose core `eksctl` workflows through a library/SDK](https://github.com/eksctl-io/eksctl/issues/813) - Greater integration test coverage and resilience - Greater unit test coverage (this will either be dependent on, or help drive out, better internal interface boundaries) @@ -49,10 +60,10 @@ Current interaction with `eksctl` is imperative, we hope to add support for decl configuration and cluster reconciliation via a new `eksctl apply -f config.yaml` command. This model will additionally allow users to manage a cluster via a git repo. -A [WIP proposal](https://github.com/weaveworks/eksctl/blob/main/docs/proposal-007-apply.md) +A [WIP proposal](https://github.com/eksctl-io/eksctl/blob/main/docs/proposal-007-apply.md) is already under consideration, to participate in the development of this feature -please refer to the [tracking issue](https://github.com/weaveworks/eksctl/issues/2774) -and our [proposal contributing guide](https://github.com/weaveworks/eksctl/blob/main/CONTRIBUTING.md#proposals). +please refer to the [tracking issue](https://github.com/eksctl-io/eksctl/issues/2774) +and our [proposal contributing guide](https://github.com/eksctl-io/eksctl/blob/main/CONTRIBUTING.md#proposals). ### Flux v2 integration (GitOps Toolkit) diff --git a/userdocs/src/favicon_300px.png b/userdocs/src/favicon_300px.png deleted file mode 100644 index f9678eb279..0000000000 Binary files a/userdocs/src/favicon_300px.png and /dev/null differ diff --git a/userdocs/src/getting-started.md b/userdocs/src/getting-started.md new file mode 100644 index 0000000000..8c055fa2d5 --- /dev/null +++ b/userdocs/src/getting-started.md @@ -0,0 +1,242 @@ +# Getting started + +!!! tip "New for 2023" + `eksctl` now supports creating fully private clusters on [AWS Outposts](/usage/outposts). + + `eksctl` now supports new ISO regions `us-iso-east-1` and `us-isob-east-1`. + + `eksctl` now supports new regions - Zurich (`eu-central-2`), Spain (`eu-south-2`), Hyderabad (`ap-south-2`), Melbourne (`ap-southeast-4`) and Tel Aviv (`il-central-1`). + +`eksctl` is a simple CLI tool for creating and managing clusters on EKS - Amazon's managed Kubernetes service for EC2. +It is written in Go, uses CloudFormation, was created by [Weaveworks](https://www.weave.works/) and it welcomes +contributions from the community. + +!!! example "Create a basic cluster in minutes with just one command" + ``` + eksctl create cluster + ``` + ![eksctl create cluster](img/eksctl-gopher.png){ align=right width=25% } + + A cluster will be created with default parameters: + + - exciting auto-generated name, e.g., `fabulous-mushroom-1527688624` + - two `m5.large` worker nodes (this instance type suits most common use-cases, and is good value for money) + - use the official AWS [EKS AMI](https://github.com/awslabs/amazon-eks-ami) + - `us-west-2` region + - a dedicated VPC (check your quotas) + +Example output: + +```sh +$ eksctl create cluster +[ℹ] using region us-west-2 +[ℹ] setting availability zones to [us-west-2a us-west-2c us-west-2b] +[ℹ] subnets for us-west-2a - public:192.168.0.0/19 private:192.168.96.0/19 +[ℹ] subnets for us-west-2c - public:192.168.32.0/19 private:192.168.128.0/19 +[ℹ] subnets for us-west-2b - public:192.168.64.0/19 private:192.168.160.0/19 +[ℹ] nodegroup "ng-98b3b83a" will use "ami-05ecac759c81e0b0c" [AmazonLinux2/1.11] +[ℹ] creating EKS cluster "floral-unicorn-1540567338" in "us-west-2" region +[ℹ] will create 2 separate CloudFormation stacks for cluster itself and the initial nodegroup +[ℹ] if you encounter any issues, check CloudFormation console or try 'eksctl utils describe-stacks --region=us-west-2 --cluster=floral-unicorn-1540567338' +[ℹ] 2 sequential tasks: { create cluster control plane "floral-unicorn-1540567338", create nodegroup "ng-98b3b83a" } +[ℹ] building cluster stack "eksctl-floral-unicorn-1540567338-cluster" +[ℹ] deploying stack "eksctl-floral-unicorn-1540567338-cluster" +[ℹ] building nodegroup stack "eksctl-floral-unicorn-1540567338-nodegroup-ng-98b3b83a" +[ℹ] --nodes-min=2 was set automatically for nodegroup ng-98b3b83a +[ℹ] --nodes-max=2 was set automatically for nodegroup ng-98b3b83a +[ℹ] deploying stack "eksctl-floral-unicorn-1540567338-nodegroup-ng-98b3b83a" +[✔] all EKS cluster resource for "floral-unicorn-1540567338" had been created +[✔] saved kubeconfig as "~/.kube/config" +[ℹ] adding role "arn:aws:iam::376248598259:role/eksctl-ridiculous-sculpture-15547-NodeInstanceRole-1F3IHNVD03Z74" to auth ConfigMap +[ℹ] nodegroup "ng-98b3b83a" has 1 node(s) +[ℹ] node "ip-192-168-64-220.us-west-2.compute.internal" is not ready +[ℹ] waiting for at least 2 node(s) to become ready in "ng-98b3b83a" +[ℹ] nodegroup "ng-98b3b83a" has 2 node(s) +[ℹ] node "ip-192-168-64-220.us-west-2.compute.internal" is ready +[ℹ] node "ip-192-168-8-135.us-west-2.compute.internal" is ready +[ℹ] kubectl command should work with "~/.kube/config", try 'kubectl get nodes' +[✔] EKS cluster "floral-unicorn-1540567338" in "us-west-2" region is ready +``` + +Customize your cluster by using a config file. Just run + +```sh +eksctl create cluster -f cluster.yaml +``` + +to apply a `cluster.yaml` file: + +```yaml +apiVersion: eksctl.io/v1alpha5 +kind: ClusterConfig + +metadata: + name: basic-cluster + region: eu-north-1 + +nodeGroups: + - name: ng-1 + instanceType: m5.large + desiredCapacity: 10 + - name: ng-2 + instanceType: m5.xlarge + desiredCapacity: 2 +``` + +Once you have created a cluster, you will find that cluster credentials were added in `~/.kube/config`. If you have +`kubectl` v1.10.x as well as `aws-iam-authenticator` commands in your PATH, you should be +able to use `kubectl`. You will need to make sure to use the same AWS API credentials for this also. Check +[EKS docs][ekskubectl] for instructions. If you installed `eksctl` via Homebrew, you should have all of these +dependencies installed already. + +To learn more about how to create clusters and other features continue reading the +[Creating and Managing Clusters section](usage/creating-and-managing-clusters). + +[ekskubectl]: https://docs.aws.amazon.com/eks/latest/userguide/configure-kubectl.html + +### Basic cluster creation + +To create a basic cluster, but with a different name, run: + +```sh +eksctl create cluster --name=cluster-1 --nodes=4 +``` + +EKS supports versions `1.23`, `1.24`, `1.25`, `1.26`, `1.27` (default) and `1.28`. +With `eksctl` you can deploy any of the supported versions by passing `--version`. + +```sh +eksctl create cluster --version=1.24 +``` + +### Listing clusters + +To list the details about a cluster or all of the clusters, use: + +```sh +eksctl get cluster [--name=][--region=] +``` + +#### Config-based creation + +You can also create a cluster passing all configuration information in a file +using `--config-file`: + +```sh +eksctl create cluster --config-file= +``` + +To create a cluster using a configuration file and skip creating +nodegroups until later: + +```sh +eksctl create cluster --config-file= --without-nodegroup +``` + +#### Cluster credentials + +To write cluster credentials to a file other than default, run: + +```sh +eksctl create cluster --name=cluster-2 --nodes=4 --kubeconfig=./kubeconfig.cluster-2.yaml +``` + +To prevent storing cluster credentials locally, run: + +```sh +eksctl create cluster --name=cluster-3 --nodes=4 --write-kubeconfig=false +``` + +To let `eksctl` manage cluster credentials under `~/.kube/eksctl/clusters` directory, run: + +```sh +eksctl create cluster --name=cluster-3 --nodes=4 --auto-kubeconfig +``` + +To obtain cluster credentials at any point in time, run: + +```sh +eksctl utils write-kubeconfig --cluster= [--kubeconfig=][--set-kubeconfig-context=] +``` + +#### Caching Credentials + +`eksctl` supports caching credentials. This is useful when using MFA and not wanting to continuously enter the MFA +token on each `eksctl` command run. + +To enable credential caching set the following environment property `EKSCTL_ENABLE_CREDENTIAL_CACHE` as such: + +```sh +export EKSCTL_ENABLE_CREDENTIAL_CACHE=1 +``` + +By default, this will result in a cache file under `~/.eksctl/cache/credentials.yaml` which will contain creds per profile +that is being used. To clear the cache, delete this file. + +It's also possible to configure the location of this cache file using `EKSCTL_CREDENTIAL_CACHE_FILENAME` which should +be the **full path** to a file in which to store the cached credentials. These are credentials, so make sure the access +of this file is restricted to the current user and in a secure location. + +### Autoscaling + +To use a 3-5 node Auto Scaling Group, run: + +```sh +eksctl create cluster --name=cluster-5 --nodes-min=3 --nodes-max=5 +``` + +You will still need to install and configure Auto Scaling. See the "Enable Auto Scaling" section. Also +note that depending on your workloads you might need to use a separate nodegroup for each AZ. See [Zone-aware +Auto Scaling](/usage/autoscaling/) for more info. + +### SSH access + +In order to allow SSH access to nodes, `eksctl` imports `~/.ssh/id_rsa.pub` by default, to use a different SSH public key, e.g. `my_eks_node_id.pub`, run: + +```sh +eksctl create cluster --ssh-access --ssh-public-key=my_eks_node_id.pub +``` + +To use a pre-existing EC2 key pair in `us-east-1` region, you can specify key pair name (which must not resolve to a local file path), e.g. to use `my_kubernetes_key` run: + +```sh +eksctl create cluster --ssh-access --ssh-public-key=my_kubernetes_key --region=us-east-1 +``` + +[AWS Systems Manager (SSM)](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-sessions-start.html#sessions-start-cli) is enabled by default, so it can be used to SSH onto nodes. + +```sh +eksctl create cluster --enable-ssm +``` + +If you are creating managed nodes with a custom launch template, the `--enable-ssm` flag is disallowed. + +### Tagging + +To add custom tags for all resources, use `--tags`. + +```sh +eksctl create cluster --tags environment=staging --region=us-east-1 +``` + +### Volume size + +To configure node root volume, use the `--node-volume-size` (and optionally `--node-volume-type`), e.g.: + +```sh +eksctl create cluster --node-volume-size=50 --node-volume-type=io1 +``` + +???+ note + The default volume size is 80G. + +### Deletion + +To delete a cluster, run: + +```sh +eksctl delete cluster --name= [--region=] +``` + +???+ note + Cluster info will be cleaned up in kubernetes config file. Please run `kubectl config get-contexts` to select right context. diff --git a/userdocs/src/img/favicon.png b/userdocs/src/img/favicon.png new file mode 100644 index 0000000000..5c3530ad22 Binary files /dev/null and b/userdocs/src/img/favicon.png differ diff --git a/userdocs/src/img/logo.png b/userdocs/src/img/logo.png new file mode 100644 index 0000000000..d260298839 Binary files /dev/null and b/userdocs/src/img/logo.png differ diff --git a/userdocs/src/index.md b/userdocs/src/index.md index dc9a93be40..df782eec41 100644 --- a/userdocs/src/index.md +++ b/userdocs/src/index.md @@ -1,98 +1,6 @@ -# eksctl - The official CLI for Amazon EKS +--- +template: home.html +title: eksctl - The official CLI for Amazon EKS +--- -sponsored by [![Weaveworks](img/empty.svg#wwinline)](https://www.weave.works/) and built by [![Contributors](img/gophers.png#inline)](https://github.com/weaveworks/eksctl/graphs/contributors) on [![Github](img/empty.svg#gitinline)](https://github.com/weaveworks/eksctl) - -!!! tip "New for 2023" - `eksctl` now supports creating fully private clusters on [AWS Outposts](/usage/outposts). - - `eksctl` now supports new regions - Zurich (`eu-central-2`), Spain (`eu-south-2`), Hyderabad (`ap-south-2`) and Melbourne (`ap-southeast-4`). - -`eksctl` is a simple CLI tool for creating and managing clusters on EKS - Amazon's managed Kubernetes service for EC2. -It is written in Go, uses CloudFormation, was created by [Weaveworks](https://www.weave.works/) and it welcomes -contributions from the community. - -!!! example "Create a basic cluster in minutes with just one command" - ``` - eksctl create cluster - ``` - ![eksctl create cluster](img/eksctl-gopher.png){ align=right } - - A cluster will be created with default parameters: - - - exciting auto-generated name, e.g., `fabulous-mushroom-1527688624` - - two `m5.large` worker nodes (this instance type suits most common use-cases, and is good value for money) - - use the official AWS [EKS AMI](https://github.com/awslabs/amazon-eks-ami) - - `us-west-2` region - - a dedicated VPC (check your quotas) - -Example output: - -``` -$ eksctl create cluster -[ℹ] using region us-west-2 -[ℹ] setting availability zones to [us-west-2a us-west-2c us-west-2b] -[ℹ] subnets for us-west-2a - public:192.168.0.0/19 private:192.168.96.0/19 -[ℹ] subnets for us-west-2c - public:192.168.32.0/19 private:192.168.128.0/19 -[ℹ] subnets for us-west-2b - public:192.168.64.0/19 private:192.168.160.0/19 -[ℹ] nodegroup "ng-98b3b83a" will use "ami-05ecac759c81e0b0c" [AmazonLinux2/1.11] -[ℹ] creating EKS cluster "floral-unicorn-1540567338" in "us-west-2" region -[ℹ] will create 2 separate CloudFormation stacks for cluster itself and the initial nodegroup -[ℹ] if you encounter any issues, check CloudFormation console or try 'eksctl utils describe-stacks --region=us-west-2 --cluster=floral-unicorn-1540567338' -[ℹ] 2 sequential tasks: { create cluster control plane "floral-unicorn-1540567338", create nodegroup "ng-98b3b83a" } -[ℹ] building cluster stack "eksctl-floral-unicorn-1540567338-cluster" -[ℹ] deploying stack "eksctl-floral-unicorn-1540567338-cluster" -[ℹ] building nodegroup stack "eksctl-floral-unicorn-1540567338-nodegroup-ng-98b3b83a" -[ℹ] --nodes-min=2 was set automatically for nodegroup ng-98b3b83a -[ℹ] --nodes-max=2 was set automatically for nodegroup ng-98b3b83a -[ℹ] deploying stack "eksctl-floral-unicorn-1540567338-nodegroup-ng-98b3b83a" -[✔] all EKS cluster resource for "floral-unicorn-1540567338" had been created -[✔] saved kubeconfig as "~/.kube/config" -[ℹ] adding role "arn:aws:iam::376248598259:role/eksctl-ridiculous-sculpture-15547-NodeInstanceRole-1F3IHNVD03Z74" to auth ConfigMap -[ℹ] nodegroup "ng-98b3b83a" has 1 node(s) -[ℹ] node "ip-192-168-64-220.us-west-2.compute.internal" is not ready -[ℹ] waiting for at least 2 node(s) to become ready in "ng-98b3b83a" -[ℹ] nodegroup "ng-98b3b83a" has 2 node(s) -[ℹ] node "ip-192-168-64-220.us-west-2.compute.internal" is ready -[ℹ] node "ip-192-168-8-135.us-west-2.compute.internal" is ready -[ℹ] kubectl command should work with "~/.kube/config", try 'kubectl get nodes' -[✔] EKS cluster "floral-unicorn-1540567338" in "us-west-2" region is ready -``` - -Customize your cluster by using a config file. Just run - -``` -eksctl create cluster -f cluster.yaml -``` - -to apply a `cluster.yaml` file: - -```yaml -apiVersion: eksctl.io/v1alpha5 -kind: ClusterConfig - -metadata: - name: basic-cluster - region: eu-north-1 - -nodeGroups: - - name: ng-1 - instanceType: m5.large - desiredCapacity: 10 - - name: ng-2 - instanceType: m5.xlarge - desiredCapacity: 2 -``` - -Once you have created a cluster, you will find that cluster credentials were added in `~/.kube/config`. If you have -`kubectl` v1.10.x as well as `aws-iam-authenticator` commands in your PATH, you should be -able to use `kubectl`. You will need to make sure to use the same AWS API credentials for this also. Check -[EKS docs][ekskubectl] for instructions. If you installed `eksctl` via Homebrew, you should have all of these -dependencies installed already. - -To learn more about how to create clusters and other features continue reading the -[Creating and Managing Clusters section](usage/creating-and-managing-clusters). - -[ekskubectl]: https://docs.aws.amazon.com/eks/latest/userguide/configure-kubectl.html - -_Need help? Join [Weave Community Slack][slackjoin]._ -[slackjoin]: https://slack.weave.works/ +eksctl - The official CLI for Amazon EKS diff --git a/userdocs/src/installation.md b/userdocs/src/installation.md new file mode 100644 index 0000000000..a428af2835 --- /dev/null +++ b/userdocs/src/installation.md @@ -0,0 +1,179 @@ +# Installation + +`eksctl` is available to install from official releases as described below. We recommend that you install `eksctl` from only the official GitHub releases. You may opt to use a third-party installer, but please be advised that AWS does not maintain nor support these methods of installation. Use them at your own discretion. + +### Prerequisite + +You will need to have AWS API credentials configured. What works for AWS CLI or any other tools (kops, Terraform, etc.) should be sufficient. You can use [`~/.aws/credentials` file][awsconfig] +or [environment variables][awsenv]. For more information read [AWS documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html). + +[awsenv]: https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html +[awsconfig]: https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html + +You will also need [AWS IAM Authenticator for Kubernetes](https://github.com/kubernetes-sigs/aws-iam-authenticator) command (either `aws-iam-authenticator` or `aws eks get-token` (available in version 1.16.156 or greater of AWS CLI) in your `PATH`. + +The IAM account used for EKS cluster creation should have these minimal access levels. + +| AWS Service | Access Level | +|------------------|--------------------------------------------------------| +| CloudFormation | Full Access | +| EC2 | **Full:** Tagging **Limited:** List, Read, Write | +| EC2 Auto Scaling | **Limited:** List, Write | +| EKS | Full Access | +| IAM | **Limited:** List, Read, Write, Permissions Management | +| Systems Manager | **Limited:** List, Read | + +### For Unix +To download the latest release, run: + +```sh +# for ARM systems, set ARCH to: `arm64`, `armv6` or `armv7` +ARCH=amd64 +PLATFORM=$(uname -s)_$ARCH + +curl -sLO "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_$PLATFORM.tar.gz" + +# (Optional) Verify checksum +curl -sL "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check + +tar -xzf eksctl_$PLATFORM.tar.gz -C /tmp && rm eksctl_$PLATFORM.tar.gz + +sudo mv /tmp/eksctl /usr/local/bin +``` + +### For Windows + +#### Direct download (latest release): [AMD64/x86_64](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_amd64.zip) - [ARMv6](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_armv6.zip) - [ARMv7](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_armv7.zip) - [ARM64](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_windows_arm64.zip) +Make sure to unzip the archive to a folder in the `PATH` variable. + +Optionally, verify the checksum: + +1. Download the checksum file: [latest](https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt) +2. Use Command Prompt to manually compare `CertUtil`'s output to the checksum file downloaded. + ```cmd + REM Replace amd64 with armv6, armv7 or arm64 + CertUtil -hashfile eksctl_Windows_amd64.zip SHA256 + ``` +3. Using PowerShell to automate the verification using the `-eq` operator to get a `True` or `False` result: +```pwsh +# Replace amd64 with armv6, armv7 or arm64 + (Get-FileHash -Algorithm SHA256 .\eksctl_Windows_amd64.zip).Hash -eq ((Get-Content .\eksctl_checksums.txt) -match 'eksctl_Windows_amd64.zip' -split ' ')[0] + ``` + +#### Using Git Bash: +```sh +# for ARM systems, set ARCH to: `arm64`, `armv6` or `armv7` +ARCH=amd64 +PLATFORM=windows_$ARCH + +curl -sLO "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_$PLATFORM.zip" + +# (Optional) Verify checksum +curl -sL "https://github.com/eksctl-io/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check + +unzip eksctl_$PLATFORM.zip -d $HOME/bin + +rm eksctl_$PLATFORM.zip +``` + +The `eksctl` executable is placed in `$HOME/bin`, which is in `$PATH` from Git Bash. + +### Docker + +For every release and RC a container image is pushed to ECR repository `public.ecr.aws/eksctl/eksctl`. Learn more about the usage on [ECR Public Gallery - eksctl](https://gallery.ecr.aws/eksctl/eksctl). For example, +```bash +docker run --rm -it public.ecr.aws/eksctl/eksctl version +``` + +### Third-Party Installers (Not Recommended) +#### For MacOS +[Homebrew](https://brew.sh) + +``` +brew tap weaveworks/tap +brew install weaveworks/tap/eksctl +``` + +[MacPorts](https://www.macports.org) + +``` +port install eksctl +``` +#### For Windows +[Chocolatey](https://chocolatey.org) + +``` +choco install eksctl +``` + +[Scoop](https://scoop.sh) + +``` +scoop install eksctl +``` + +### Shell Completion + +#### Bash +To enable bash completion, run the following, or put it in `~/.bashrc` or `~/.profile`: + +``` +. <(eksctl completion bash) +``` + +#### Zsh +For zsh completion, please run: + +``` +mkdir -p ~/.zsh/completion/ +eksctl completion zsh > ~/.zsh/completion/_eksctl +``` + +and put the following in `~/.zshrc`: + +``` +fpath=($fpath ~/.zsh/completion) +``` + +Note if you're not running a distribution like oh-my-zsh you may first have to enable autocompletion (and put in `~/.zshrc` to make it persistent): + +``` +autoload -U compinit +compinit +``` + +#### Fish +The below commands can be used for fish auto completion: + +``` +mkdir -p ~/.config/fish/completions +eksctl completion fish > ~/.config/fish/completions/eksctl.fish +``` + +#### Powershell + +The below command can be referred for setting it up. Please note that the path might be different depending on your +system settings. + +``` +eksctl completion powershell > C:\Users\Documents\WindowsPowerShell\Scripts\eksctl.ps1 +``` + + +## Features + +The features that are currently implemented are: + +- Create, get, list and delete clusters +- Create, drain and delete nodegroups +- Scale a nodegroup +- Update a cluster +- Use custom AMIs +- Configure VPC Networking +- Configure access to API endpoints +- Support for GPU nodegroups +- Spot instances and mixed instances +- IAM Management and Add-on Policies +- List cluster Cloudformation stacks +- Install coredns +- Write kubeconfig file for a cluster diff --git a/userdocs/src/introduction.md b/userdocs/src/introduction.md deleted file mode 100644 index 983b8bab04..0000000000 --- a/userdocs/src/introduction.md +++ /dev/null @@ -1,367 +0,0 @@ -## Getting started - -### Basic cluster creation - -To create a basic cluster, but with a different name, run: - -``` - -eksctl create cluster --name=cluster-1 --nodes=4 - -``` - -EKS supports versions `1.22`, `1.23`, `1.24`, `1.25` (default), `1.26` and `1.27`. -With `eksctl` you can deploy any of the supported versions by passing `--version`. - -``` - -eksctl create cluster --version=1.24 - -``` - -### Listing clusters - -To list the details about a cluster or all of the clusters, use: - -``` - -eksctl get cluster [--name=][--region=] - -``` - -#### Config-based creation - -You can also create a cluster passing all configuration information in a file -using `--config-file`: - -``` - -eksctl create cluster --config-file= - -``` - -To create a cluster using a configuration file and skip creating -nodegroups until later: - -``` - -eksctl create cluster --config-file= --without-nodegroup - -``` - -#### Cluster credentials - -To write cluster credentials to a file other than default, run: - -``` - -eksctl create cluster --name=cluster-2 --nodes=4 --kubeconfig=./kubeconfig.cluster-2.yaml - -``` - -To prevent storing cluster credentials locally, run: - -``` - -eksctl create cluster --name=cluster-3 --nodes=4 --write-kubeconfig=false - -``` - -To let `eksctl` manage cluster credentials under `~/.kube/eksctl/clusters` directory, run: - -``` - -eksctl create cluster --name=cluster-3 --nodes=4 --auto-kubeconfig - -``` - -To obtain cluster credentials at any point in time, run: - -``` - -eksctl utils write-kubeconfig --cluster= [--kubeconfig=][--set-kubeconfig-context=] - -``` - -#### Caching Credentials - -`eksctl` supports caching credentials. This is useful when using MFA and not wanting to continuously enter the MFA -token on each `eksctl` command run. - -To enable credential caching set the following environment property `EKSCTL_ENABLE_CREDENTIAL_CACHE` as such: - -``` -export EKSCTL_ENABLE_CREDENTIAL_CACHE=1 -``` - -By default, this will result in a cache file under `~/.eksctl/cache/credentials.yaml` which will contain creds per profile -that is being used. To clear the cache, delete this file. - -It's also possible to configure the location of this cache file using `EKSCTL_CREDENTIAL_CACHE_FILENAME` which should -be the **full path** to a file in which to store the cached credentials. These are credentials, so make sure the access -of this file is restricted to the current user and in a secure location. - -### Autoscaling - -To use a 3-5 node Auto Scaling Group, run: - -``` - -eksctl create cluster --name=cluster-5 --nodes-min=3 --nodes-max=5 - -``` - -???+ note - You will still need to install and configure Auto Scaling. See the "Enable Auto Scaling" section. Also - note that depending on your workloads you might need to use a separate nodegroup for each AZ. See [Zone-aware - Auto Scaling](/usage/autoscaling/) for more info. - -### SSH access - -In order to allow SSH access to nodes, `eksctl` imports `~/.ssh/id_rsa.pub` by default, to use a different SSH public key, e.g. `my_eks_node_id.pub`, run: - -``` - -eksctl create cluster --ssh-access --ssh-public-key=my_eks_node_id.pub - -``` - -To use a pre-existing EC2 key pair in `us-east-1` region, you can specify key pair name (which must not resolve to a local file path), e.g. to use `my_kubernetes_key` run: - -``` - -eksctl create cluster --ssh-access --ssh-public-key=my_kubernetes_key --region=us-east-1 - -``` - -[AWS Systems Manager (SSM)](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-sessions-start.html#sessions-start-cli) is enabled by default, so it can be used to SSH onto nodes. - - -``` - -eksctl create cluster --enable-ssm - -``` - -???+ note - If you are creating managed nodes with a custom launch template, the `--enable-ssm` flag is disallowed. - -### Tagging - -To add custom tags for all resources, use `--tags`. - -``` - -eksctl create cluster --tags environment=staging --region=us-east-1 - -``` - -### Volume size - -???+ note - The default volume size is 80G. - -To configure node root volume, use the `--node-volume-size` (and optionally `--node-volume-type`), e.g.: - -``` - -eksctl create cluster --node-volume-size=50 --node-volume-type=io1 - -``` - -### Deletion - -To delete a cluster, run: - -``` - -eksctl delete cluster --name= [--region=] - -``` - -???+ note - Cluster info will be cleaned up in kubernetes config file. Please run `kubectl config get-contexts` to select right context. - -## Contributions - -Code contributions are very welcome. If you are interested in helping make `eksctl` great then see our [contributing guide](https://github.com/weaveworks/eksctl/blob/master/CONTRIBUTING.md). - -_Need help? Join [Weave Community Slack][slackjoin]._ -[slackjoin]: https://slack.weave.works/ - - -## Installation - -`eksctl` is available to install from official releases as described below. We recommend that you install `eksctl` from only the official GitHub releases. You may opt to use a third-party installer, but please be advised that AWS does not maintain nor support these methods of installation. Use them at your own discretion. - -### Prerequisite - -You will need to have AWS API credentials configured. What works for AWS CLI or any other tools (kops, Terraform, etc.) should be sufficient. You can use [`~/.aws/credentials` file][awsconfig] -or [environment variables][awsenv]. For more information read [AWS documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html). - -[awsenv]: https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html -[awsconfig]: https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html - -You will also need [AWS IAM Authenticator for Kubernetes](https://github.com/kubernetes-sigs/aws-iam-authenticator) command (either `aws-iam-authenticator` or `aws eks get-token` (available in version 1.16.156 or greater of AWS CLI) in your `PATH`. - -The IAM account used for EKS cluster creation should have these minimal access levels. - -| AWS Service | Access Level | -|------------------|--------------------------------------------------------| -| CloudFormation | Full Access | -| EC2 | **Full:** Tagging **Limited:** List, Read, Write | -| EC2 Auto Scaling | **Limited:** List, Write | -| EKS | Full Access | -| IAM | **Limited:** List, Read, Write, Permissions Management | -| Systems Manager | **Limited:** List, Read | - -### For Unix -To download the latest release, run: - -```sh -# for ARM systems, set ARCH to: `arm64`, `armv6` or `armv7` -ARCH=amd64 -PLATFORM=$(uname -s)_$ARCH - -curl -sLO "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$PLATFORM.tar.gz" - -# (Optional) Verify checksum -curl -sL "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check - -tar -xzf eksctl_$PLATFORM.tar.gz -C /tmp && rm eksctl_$PLATFORM.tar.gz - -sudo mv /tmp/eksctl /usr/local/bin -``` - -### For Windows - -#### Direct download (latest release): [AMD64/x86_64](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_amd64.zip) - [ARMv6](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_armv6.zip) - [ARMv7](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_armv7.zip) - [ARM64](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_windows_arm64.zip) -Make sure to unzip the archive to a folder in the `PATH` variable. - -Optionally, verify the checksum: - -1. Download the checksum file: [latest](https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_checksums.txt) -2. Use Command Prompt to manually compare `CertUtil`'s output to the checksum file downloaded. - ```cmd - REM Replace amd64 with armv6, armv7 or arm64 - CertUtil -hashfile eksctl_Windows_amd64.zip SHA256 - ``` -3. Using PowerShell to automate the verification using the `-eq` operator to get a `True` or `False` result: -```pwsh -# Replace amd64 with armv6, armv7 or arm64 - (Get-FileHash -Algorithm SHA256 .\eksctl_Windows_amd64.zip).Hash -eq ((Get-Content .\eksctl_checksums.txt) -match 'eksctl_Windows_amd64.zip' -split ' ')[0] - ``` - -#### Using Git Bash: -```sh -# for ARM systems, set ARCH to: `arm64`, `armv6` or `armv7` -ARCH=amd64 -PLATFORM=windows_$ARCH - -curl -sLO "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$PLATFORM.zip" - -# (Optional) Verify checksum -curl -sL "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check - -unzip eksctl_$PLATFORM.zip -d $HOME/bin - -rm eksctl_$PLATFORM.zip -``` - -The `eksctl` executable is placed in `$HOME/bin`, which is in `$PATH` from Git Bash. - -### Docker - -For every release and RC, a docker image is pushed to [weaveworks/eksctl - Docker Image | Docker Hub](https://hub.docker.com/r/weaveworks/eksctl). - -### Third-Party Installers (Not Recommended) -#### For MacOS -[Homebrew](https://brew.sh) - -``` -brew tap weaveworks/tap -brew install weaveworks/tap/eksctl -``` - -[MacPorts](https://www.macports.org) - -``` -port install eksctl -``` -#### For Windows -[Chocolatey](https://chocolatey.org) - -``` -chocolatey install eksctl -``` - -[Scoop](https://scoop.sh) - -``` -scoop install eksctl -``` - -### Shell Completion - -#### Bash -To enable bash completion, run the following, or put it in `~/.bashrc` or `~/.profile`: - -``` -. <(eksctl completion bash) -``` - -#### Zsh -For zsh completion, please run: - -``` -mkdir -p ~/.zsh/completion/ -eksctl completion zsh > ~/.zsh/completion/_eksctl -``` - -and put the following in `~/.zshrc`: - -``` -fpath=($fpath ~/.zsh/completion) -``` - -Note if you're not running a distribution like oh-my-zsh you may first have to enable autocompletion (and put in `~/.zshrc` to make it persistent): - -``` -autoload -U compinit -compinit -``` - -#### Fish -The below commands can be used for fish auto completion: - -``` -mkdir -p ~/.config/fish/completions -eksctl completion fish > ~/.config/fish/completions/eksctl.fish -``` - -#### Powershell - -The below command can be referred for setting it up. Please note that the path might be different depending on your -system settings. - -``` -eksctl completion powershell > C:\Users\Documents\WindowsPowerShell\Scripts\eksctl.ps1 -``` - -## Features - -The features that are currently implemented are: - -- Create, get, list and delete clusters -- Create, drain and delete nodegroups -- Scale a nodegroup -- Update a cluster -- Use custom AMIs -- Configure VPC Networking -- Configure access to API endpoints -- Support for GPU nodegroups -- Spot instances and mixed instances -- IAM Management and Add-on Policies -- List cluster Cloudformation stacks -- Install coredns -- Write kubeconfig file for a cluster diff --git a/userdocs/src/javascripts/extra.js b/userdocs/src/javascripts/extra.js new file mode 100644 index 0000000000..8273a23792 --- /dev/null +++ b/userdocs/src/javascripts/extra.js @@ -0,0 +1,28 @@ +const Github_contributors_url = 'https://api.github.com/repos/eksctl-io/eksctl/contributors?per_page=100'; + +const getContributors = () => { + axios + .get(Github_contributors_url) + .then((response) => { + const contributors = response.data; + const container = document.getElementById('contributors'); + const imageTags = contributors.map(img => `    `); + container.innerHTML = imageTags.join(''); + }) + .catch((error) => console.error(error)); +}; + +document.addEventListener( 'DOMContentLoaded', function() { + // Show Github Contributors on Homepage + getContributors(); + + // Show adopters carousel + new Glide('.adopters', { + type: 'carousel', + autoplay: 4000, + hoverpause: false, + perView: 3, + animationTimingFunc: 'linear', + animationDuration: 1000 + }).mount() +}); \ No newline at end of file diff --git a/userdocs/src/stylesheets/extra.css b/userdocs/src/stylesheets/extra.css index 8c46cc345b..02011211d5 100644 --- a/userdocs/src/stylesheets/extra.css +++ b/userdocs/src/stylesheets/extra.css @@ -16,23 +16,50 @@ img[src$="#wwinline"] { vertical-align: middle; } -.md-header-nav__title { - padding: 0px; -} - [data-md-color-scheme="slate"] { --md-default-fg-color: #c8cad5; } -[data-md-color-scheme="slate"] img[src$="#wwinline"] { - background: url("../img/weaveworks-light.svg") no-repeat; +a.md-button.announce { + padding: 0.3em 0.3em; } -[data-md-color-scheme="slate"] img[src$="#gitinline"] { - height: 30px; - background: url("../img/octocat-light.svg") no-repeat; +.md-header__button.md-logo img, .md-header__button.md-logo svg { + height: 1.9rem; } -.md-typeset .md-button { - padding: 0.3em 0.3em; +@keyframes heart { + 0%, 40%, 80%, 100% { + transform: scale(1); + } + 20%, 60% { + transform: scale(1.15); + } + } + +.heart { + animation: heart 1000ms infinite; +} + +.glide__slide img { + height: 50px; +} + +.glide__slides { + list-style-type: none !important; +} + +.glide { + width: 100%; + padding: .4rem 0; + text-align: center; + margin: auto 0.6rem; +} + +.md-copyright { + width: 100% !important; +} + +ol:not([hidden]).glide__slides, ul:not([hidden]).glide__slides { + display: flex !important; } \ No newline at end of file diff --git a/userdocs/src/usage/addons.md b/userdocs/src/usage/addons.md index 34e2b1f90e..415c6996b2 100644 --- a/userdocs/src/usage/addons.md +++ b/userdocs/src/usage/addons.md @@ -6,7 +6,7 @@ CNI plugin through the EKS API ## Creating addons -You can specify what addons you want and what policies (if required) to attach to them in your config file: +In your config file, you can specify the addons you want and (if required) the policies to attach to them: ```yaml apiVersion: eksctl.io/v1alpha5 @@ -20,13 +20,17 @@ iam: addons: - name: vpc-cni - version: 1.7.5 # optional - attachPolicyARNs: #optional - - arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy - serviceAccountRoleARN: arn:aws:iam::aws:policy/AmazonEKSCNIAccess # optional - tags: # optional + # all below properties are optional + version: 1.7.5 + tags: team: eks - attachPolicy: # optional + # you can specify at most one of + attachPolicyARNs: + - arn:aws:iam::account:policy/AmazonEKS_CNI_Policy + # or + serviceAccountRoleARN: arn:aws:iam::account:role/AmazonEKSCNIAccess + # or + attachPolicy: Statement: - Effect: Allow Action: @@ -58,17 +62,17 @@ You can then either have these addons created during the cluster creation proces eksctl create cluster -f config.yaml ``` -Or you can create after cluster creation using the config file or CLI flags: +Or create the addons explicitly after cluster creation using the config file or CLI flags: ```console eksctl create addon -f config.yaml ``` ```console -eksctl create addon --name vpc-cni --version 1.7.5 --service-account-role-arn= +eksctl create addon --name vpc-cni --version 1.7.5 --service-account-role-arn ``` -During addon creation, if a self-managed version of the addon already exists on the cluster, you can choose how potential `configMap` conflicts shall be resolved by setting `resolveConflicts` option via the config file. e.g., +During addon creation, if a self-managed version of the addon already exists on the cluster, you can choose how potential `configMap` conflicts shall be resolved by setting `resolveConflicts` option via the config file, e.g. ```yaml addons: @@ -78,10 +82,11 @@ addons: resolveConflicts: overwrite ``` -For addon create, the `resolveConflicts` field supports two distinct values. +For addon create, the `resolveConflicts` field supports three distinct values: -- `overwrite` - EKS overwrites any config changes back to EKS default values -- `none` - EKS doesn't change the value. The create might fail. +- `none` - EKS doesn't change the value. The create might fail. +- `overwrite` - EKS overwrites any config changes back to EKS default values. +- `preserve` - EKS doesn't change the value. The create might fail. (Similarly to `none`, but different from [`preserve` in updating addons](#updating-addons)) ## Listing enabled addons @@ -180,7 +185,7 @@ eksctl update addon -f config.yaml ``` ```console -eksctl update addon --name vpc-cni --version 1.8.0 --service-account-role-arn= +eksctl update addon --name vpc-cni --version 1.8.0 --service-account-role-arn ``` Similarly to addon creation, When updating an addon, you have full control over the config changes that you may have previously applied on that add-on's `configMap`. Specifically, you can preserve, or overwrite them. This optional functionality is available via the same config file field `resolveConflicts`. e.g., @@ -194,16 +199,16 @@ addons: resolveConflicts: preserve ``` -For addon update, the `resolveConflicts` field accepts three distinct values. +For addon update, the `resolveConflicts` field accepts three distinct values: -- `preserve` - EKS preserves the value. If you choose this option, we recommend that you test any field and value changes on a non-production cluster before updating the add-on on your production cluster. -- `overwrite` - EKS overwrites any config changes back to EKS default values - `none` - EKS doesn't change the value. The update might fail. +- `overwrite` - EKS overwrites any config changes back to EKS default values. +- `preserve` - EKS preserves the value. If you choose this option, we recommend that you test any field and value changes on a non-production cluster before updating the add-on on your production cluster. ## Deleting addons You can delete an addon by running: ```console -eksctl delete addon --cluster --name --name ``` This will delete the addon and any IAM roles associated to it. diff --git a/userdocs/src/usage/autoscaling.md b/userdocs/src/usage/autoscaling.md index 624bb0efe0..ec19aba917 100644 --- a/userdocs/src/usage/autoscaling.md +++ b/userdocs/src/usage/autoscaling.md @@ -85,7 +85,7 @@ You won't need a separate nodegroup for each AZ if your environment meets the fo - No required nodeAffinity on zone label. - No nodeSelector on a zone label. -(Read more [here](https://github.com/kubernetes/autoscaler/pull/1802#issuecomment-474295002) and [here](https://github.com/weaveworks/eksctl/pull/647#issuecomment-474698054).) +(Read more [here](https://github.com/kubernetes/autoscaler/pull/1802#issuecomment-474295002) and [here](https://github.com/eksctl-io/eksctl/pull/647#issuecomment-474698054).) If you meet all of the above requirements (and possibly others) then you should be safe with a single nodegroup which spans multiple AZs. Otherwise you'll want to create separate, single-AZ nodegroups: diff --git a/userdocs/src/usage/creating-and-managing-clusters.md b/userdocs/src/usage/creating-and-managing-clusters.md index f2c2e95db4..b7032e48d6 100644 --- a/userdocs/src/usage/creating-and-managing-clusters.md +++ b/userdocs/src/usage/creating-and-managing-clusters.md @@ -124,7 +124,7 @@ eksctl delete cluster -f cluster.yaml eksctl delete cluster -f cluster.yaml --disable-nodegroup-eviction ``` -See [`examples/`](https://github.com/weaveworks/eksctl/tree/master/examples) directory for more sample config files. +See [`examples/`](https://github.com/eksctl-io/eksctl/tree/master/examples) directory for more sample config files. ## Dry Run The dry-run feature enables generating a ClusterConfig file that skips cluster creation and outputs a ClusterConfig file that diff --git a/userdocs/src/usage/custom-ami-support.md b/userdocs/src/usage/custom-ami-support.md index 160dbe410a..72f07e4bf9 100644 --- a/userdocs/src/usage/custom-ami-support.md +++ b/userdocs/src/usage/custom-ami-support.md @@ -30,12 +30,15 @@ Config file example: nodeGroups: - name: ng1 instanceType: p2.xlarge + amiFamily: AmazonLinux2 ami: auto - name: ng2 instanceType: m5.large + amiFamily: AmazonLinux2 ami: ami-custom1234 managedNodeGroups: - name: m-ng-2 + amiFamily: AmazonLinux2 ami: ami-custom1234 instanceType: m5.large overrideBootstrapCommand: | @@ -79,6 +82,36 @@ managedNodeGroups: The `--node-ami-family` flag can also be used with `eksctl create nodegroup`. `eksctl` requires AMI Family to be explicitly set via config file or via `--node-ami-family` CLI flag, whenever working with a custom AMI. +???+ note + At the moment, EKS managed nodegroups only support the following AMI Families when working with custom AMIs: `AmazonLinux2`, `Ubuntu1804` and `Ubuntu2004` + +## Windows custom AMI support +Only self-managed Windows nodegroups can specify a custom AMI. `amiFamily` should be set to a valid Windows AMI family. + +The following PowerShell variables will be available to the bootstrap script: + +``` +$EKSBootstrapScriptFile +$EKSClusterName +$APIServerEndpoint +$Base64ClusterCA +$ServiceCIDR +$KubeletExtraArgs +$KubeletExtraArgsMap: A hashtable containing arguments for the kubelet, e.g., @{ 'node-labels' = ''; 'register-with-taints' = ''; 'max-pods' = '10'} +$DNSClusterIP +$ContainerRuntime +``` + +Config file example: +```yaml +nodeGroups: + - name: custom-windows + amiFamily: WindowsServer2022FullContainer + ami: ami-01579b74557facaf7 + overrideBootstrapCommand: | + & $EKSBootstrapScriptFile -EKSClusterName "$EKSClusterName" -APIServerEndpoint "$APIServerEndpoint" -Base64ClusterCA "$Base64ClusterCA" -ContainerRuntime "containerd" -KubeletExtraArgs "$KubeletExtraArgs" 3>&1 4>&1 5>&1 6>&1 +``` + ## Bottlerocket custom AMI support For Bottlerocket nodes, the `overrideBootstrapCommand` is not supported. Instead, to designate their own bootstrap container, one should use the `bottlerocket` field as part of the configuration file. E.g. @@ -91,7 +124,7 @@ For Bottlerocket nodes, the `overrideBootstrapCommand` is not supported. Instead bottlerocket: enableAdminContainer: true settings: - bootstrap-containers - bootstrap + bootstrap-containers: + bootstrap: source: -``` \ No newline at end of file +``` diff --git a/userdocs/src/usage/eks-managed-nodes.md b/userdocs/src/usage/eks-managed-nodes.md index be8f94e183..45ae8b8c11 100644 --- a/userdocs/src/usage/eks-managed-nodes.md +++ b/userdocs/src/usage/eks-managed-nodes.md @@ -63,7 +63,7 @@ managedNodeGroups: minSize: 2 maxSize: 3 ``` -Another example of a config file for creating a managed nodegroup can be found [here](https://github.com/weaveworks/eksctl/blob/main/examples/15-managed-nodes.yaml). +Another example of a config file for creating a managed nodegroup can be found [here](https://github.com/eksctl-io/eksctl/blob/main/examples/15-managed-nodes.yaml). It's possible to have a cluster with both managed and unmanaged nodegroups. Unmanaged nodegroups do not show up in the AWS EKS console but `eksctl get nodegroup` will list both types of nodegroups. @@ -235,7 +235,7 @@ eksctl upgrade nodegroup --name=managed-ng-1 --cluster=managed-cluster --release ``` ## Handling parallel upgrades for nodes -Multiple managed nodes can be upgraded simultaneously. To configure parallel upgrades, define the `updateConfig` of a nodegroup when creating the nodegroup. An example `updateConfig` can be found [here](https://github.com/weaveworks/eksctl/blob/main/examples/15-managed-nodes.yaml). +Multiple managed nodes can be upgraded simultaneously. To configure parallel upgrades, define the `updateConfig` of a nodegroup when creating the nodegroup. An example `updateConfig` can be found [here](https://github.com/eksctl-io/eksctl/blob/main/examples/15-managed-nodes.yaml). To avoid any downtime to your workloads due to upgrading multiple nodes at once, you can limit the number of nodes that can become unavailable during an upgrade by specifying this in the `maxUnavailable` field of an `updateConfig`. Alternatively, use `maxUnavailablePercentage`, which defines the maximum number of unavailable nodes as a percentage of the total number of nodes. diff --git a/userdocs/src/usage/eks-private-cluster.md b/userdocs/src/usage/eks-private-cluster.md index 59de1d0fea..3cef132f57 100644 --- a/userdocs/src/usage/eks-private-cluster.md +++ b/userdocs/src/usage/eks-private-cluster.md @@ -16,9 +16,9 @@ privateCluster: ``` ???+ note - You can now use [AWS PrivateLink](https://docs.aws.amazon.com/vpc/latest/privatelink/getting-started.html) to privately access the Amazon Elastic Kubernetes Service (Amazon EKS) management APIs from your Amazon Virtual Private Cloud (VPC). - Post cluster creation, not all eksctl commands will be supported, especially commands that need access to the OpenID Connect provider URL since the endpoint is publicly reachable. You will need to execute the oidc related commands from outside of your cluster's VPC once you've enabled AWS PrivateLink for Amazon EKS. - Creating managed nodegroups will continue to work, and creating self-managed nodegroups will work as it needs access to the API server via the EKS [interface endpoint](https://aws.amazon.com/about-aws/whats-new/2022/12/amazon-eks-supports-aws-privatelink/) if the command is run from within the cluster's VPC, a peered VPC or using some other means like AWS Direct Connect. + Post cluster creation, eksctl commands that need access to the Kubernetes API server will have to be run from within the cluster's VPC, a peered VPC or using some other means like AWS Direct Connect. eksctl commands that need access to the EKS APIs will not work if they're being run from within the cluster's VPC. To fix this, [create an interface endpoint for Amazon EKS](https://docs.aws.amazon.com/eks/latest/userguide/vpc-interface-endpoints.html) to privately access the Amazon Elastic Kubernetes Service (Amazon EKS) management APIs from your Amazon Virtual Private Cloud (VPC). In a future release, eksctl will add support to create this endpoint so it does not need to be manually created. + Commands that need access to the OpenID Connect provider URL will need to be run from outside of your cluster's VPC once you've enabled AWS PrivateLink for Amazon EKS. + Creating managed nodegroups will continue to work, and creating self-managed nodegroups will work as it needs access to the API server via the EKS [interface endpoint](https://aws.amazon.com/about-aws/whats-new/2022/12/amazon-eks-supports-aws-privatelink/) if the command is run from within the cluster's VPC, a peered VPC or using some other means like AWS Direct Connect. ???+ info VPC endpoints are charged by the hour and based on usage. More details about pricing can be found at @@ -31,7 +31,6 @@ privateCluster: To enable worker nodes to access AWS services privately, eksctl creates VPC endpoints for the following services: -- An interface endpoint for EKS to privately access the EKS management APIs - Interface endpoints for ECR (both `ecr.api` and `ecr.dkr`) to pull container images (AWS CNI plugin etc) - A gateway endpoint for S3 to pull the actual image layers - An interface endpoint for EC2 required by the `aws-cloud-provider` integration diff --git a/userdocs/src/usage/gitops-v2.md b/userdocs/src/usage/gitops-v2.md index c6c2c2613a..31d10a6af2 100644 --- a/userdocs/src/usage/gitops-v2.md +++ b/userdocs/src/usage/gitops-v2.md @@ -1,42 +1,24 @@ -# New: GitOps with Flux v2 +# GitOps with Flux v2 -!!! warning "Flux v2 `eksctl` integration is **experimental**" - Partial experimental support for [Flux v2 (part of the GitOps Toolkit)](https://toolkit.fluxcd.io/) - was made available in `eksctl` version `0.38.0`. - - Complete, but still **experimental**, support for Flux v2 is available in `eksctl` from version `0.53.0`. - There are significant API changes from the `0.38.0-0.52.0` support with this release, please refer to this documentation. - - Disruptions are still likely until development has stabilised. - All changes will be noted in [releases](https://github.com/weaveworks/eksctl/releases). - -[Gitops][gitops] is a way to do Kubernetes application delivery. It +[Gitops](https://www.weave.works/technologies/gitops/) is a way to do Kubernetes application delivery. It works by using Git as a single source of truth for Kubernetes resources and everything else. With Git at the center of your delivery pipelines, you and your team can make pull requests to accelerate and simplify application deployments and operations tasks to Kubernetes. -[gitops]: https://www.weave.works/technologies/gitops/ - ## Installing Flux v2 (GitOps Toolkit) -_Initial Flux v2 support was released in `0.38.0`, but the API has undergone significant changes. An older -example can be found [here](https://github.com/weaveworks/eksctl/blob/a854bdbd3e47059d860a78600c2c1813281f4ebf/examples/12-gitops-toolkit.yaml)._ - -From version `0.53.0`, `eksctl` provides an option to alternatively bootstrap [Flux v2](https://toolkit.fluxcd.io/) -components into an EKS cluster, with the `enable flux` subcommand. +Starting with version `0.53.0`, `eksctl` provides the option to bootstrap [Flux v2](https://fluxcd.io/flux/) components into an EKS cluster, with the `enable flux` subcommand. ```console eksctl enable flux --config-file ``` -The `enable flux` command will shell out to the `flux` binary and run the `flux bootstrap` command -against the cluster. +The `enable flux` command will shell out to the `flux` binary and run the `flux bootstrap` command against the cluster. In order to allow users to specify whichever `bootstrap` flags they like, the `eksctl` API exposes an arbitrary `map[string]string` of `flags`. To find out which flags you need -to bootstrap your cluster, refer to the [Flux docs](https://fluxcd.io/docs/), -or run `flux bootstrap --help`. +to bootstrap your cluster, simply run `flux bootstrap --help`. Example: ```YAML @@ -54,7 +36,6 @@ gitops: flux: gitProvider: github # required. options are github, gitlab or git flags: # required. arbitrary map[string]string for all flux args. - # these args are not controlled by eksctl. see https://fluxcd.io/docs/get-started/ for all available flags owner: "dr-who" repository: "our-org-gitops-repo" private: "true" @@ -64,7 +45,7 @@ gitops: team: "team1,team2" ``` -This example configuration can be found [here](https://github.com/weaveworks/eksctl/blob/main/examples/12-gitops-toolkit.yaml). +This example configuration can be found [here](https://github.com/eksctl-io/eksctl/blob/main/examples/12-gitops-toolkit.yaml). ???+ note Flux v2 configuration can **only** be provided via configuration file; no flags @@ -82,7 +63,7 @@ source-controller-7f856877cf-jgwdk 1/1 Running 0 3m39s ``` For instructions on how to use your newly installed Gitops Toolkit, -refer to the [official docs](https://fluxcd.io/docs/get-started/). +refer to the [official docs](https://fluxcd.io/flux/). ### Bootstrap after cluster create @@ -97,14 +78,11 @@ eksctl create cluster --config-file #### Environment variables -Before running `eksctl enable flux`, ensure that you have read the [Flux bootstrap docs](https://fluxcd.io/docs/get-started/). -If you are using Github or Gitlab as your git provider, either `GITHUB_TOKEN` or `GITLAB_TOKEN` -must be exported with your Personal Access Token in your session. Please refer to the Flux docs -for any other requirements. +Before running `eksctl enable flux`, ensure that you have read the [Flux getting started docs](https://fluxcd.io/flux/get-started/). If you are using Github or Gitlab as your git provider, either `GITHUB_TOKEN` or `GITLAB_TOKEN` must be exported with your Personal Access Token in your session. Please refer to the Flux docs for any other requirements. #### Flux version -Eksctl requires a minimum Flux version of `0.13.3`. +Eksctl requires a minimum Flux version of `0.32.0`. ## Quickstart profiles @@ -112,4 +90,8 @@ Quickstart profiles will **not** be supported with Flux v2. ## Further reading -To learn more about gitops and Flux, check the Flux [documentation](https://fluxcd.io/). +To learn more about gitops and Flux, check out [Flux official webpage](https://fluxcd.io/flux/). + +For Enterprise support with SLA guarantees for open source Flux and eksctl explore [Weave GitOps Assured](https://www.weave.works/product/gitops/). + +For a trusted, fleet-scale commercial GitOps automation solution explore [Weave GitOps Enterprise](https://www.weave.works/product/gitops-enterprise/). diff --git a/userdocs/src/usage/iamserviceaccounts.md b/userdocs/src/usage/iamserviceaccounts.md index 2c18e1d290..51966221db 100644 --- a/userdocs/src/usage/iamserviceaccounts.md +++ b/userdocs/src/usage/iamserviceaccounts.md @@ -97,6 +97,13 @@ The `eksctl create iamserviceaccount` command supports `--include` and `--exclud [this section](/usage/managing-nodegroups#include-and-exclude-rules) for more details about how these work). And the `eksctl delete iamserviceaccount` command supports `--only-missing` as well, so you can perform deletions the same way as nodegroups. +???+ note + IAM service accounts are scoped within a namespace, i.e. two service accounts with the same name may exist in different namespaces. Thus, to uniquely define a service account as part of `--include`, `--exclude` flags, you will need to pass the name string in the `namespace/name` format. E.g. + + ``` + eksctl create iamserviceaccount --config-file= --include backend-apps/s3-reader + ``` + The option to enable `wellKnownPolicies` is included for using IRSA with well-known use cases like `cluster-autoscaler` and `cert-manager`, as a shorthand for lists of policies. diff --git a/userdocs/src/usage/instance-selector.md b/userdocs/src/usage/instance-selector.md index dc1708cf1c..6b92e38e30 100644 --- a/userdocs/src/usage/instance-selector.md +++ b/userdocs/src/usage/instance-selector.md @@ -62,7 +62,7 @@ The following instance selector CLI options are supported by `eksctl create clus `--instance-selector-vcpus`, `--instance-selector-memory`, `--instance-selector-gpus` and `instance-selector-cpu-architecture` -An example file can be found [here](https://github.com/weaveworks/eksctl/blob/main/examples/28-instance-selector.yaml). +An example file can be found [here](https://github.com/eksctl-io/eksctl/blob/main/examples/28-instance-selector.yaml). ### Dry Run The [dry-run](/usage/dry-run) feature allows you to inspect and change the instances matched by the instance selector before proceeding diff --git a/userdocs/src/usage/minimum-iam-policies.md b/userdocs/src/usage/minimum-iam-policies.md index 0f999bed37..7b8dd35ec1 100644 --- a/userdocs/src/usage/minimum-iam-policies.md +++ b/userdocs/src/usage/minimum-iam-policies.md @@ -128,7 +128,6 @@ IamLimitedAccess "iam:DeleteRole", "iam:AttachRolePolicy", "iam:PutRolePolicy", - "iam:ListInstanceProfiles", "iam:AddRoleToInstanceProfile", "iam:ListInstanceProfilesForRole", "iam:PassRole", diff --git a/userdocs/src/usage/nodegroup-taints.md b/userdocs/src/usage/nodegroup-taints.md index 4f02f06455..e86c570efa 100644 --- a/userdocs/src/usage/nodegroup-taints.md +++ b/userdocs/src/usage/nodegroup-taints.md @@ -12,4 +12,4 @@ To apply [taints](https://kubernetes.io/docs/concepts/scheduling-eviction/taint- effect: NoExecute ``` -A full example can be found [here](https://github.com/weaveworks/eksctl/blob/main/examples/34-taints.yaml). +A full example can be found [here](https://github.com/eksctl-io/eksctl/blob/main/examples/34-taints.yaml). diff --git a/userdocs/src/usage/outposts.md b/userdocs/src/usage/outposts.md index 8b26893d3a..413c3526d0 100644 --- a/userdocs/src/usage/outposts.md +++ b/userdocs/src/usage/outposts.md @@ -212,10 +212,10 @@ nodeGroups: * [Addons](/usage/addons) * [IAM Roles for Service Accounts](/usage/iamserviceaccounts) * [IPv6](/usage/vpc-ip-family) -* [Identity Providers](https://github.com/weaveworks/eksctl/blob/main/examples/27-oidc-provider.yaml) +* [Identity Providers](https://github.com/eksctl-io/eksctl/blob/main/examples/27-oidc-provider.yaml) * [Fargate](/usage/fargate-support) * [KMS Encryption](/usage/kms-encryption) -* [Local Zones](https://github.com/weaveworks/eksctl/blob/main/examples/33-local-zones.yaml) +* [Local Zones](https://github.com/eksctl-io/eksctl/blob/main/examples/33-local-zones.yaml) * [Karpenter](/usage/eksctl-karpenter) * [GitOps](/usage/gitops-v2) * [Instance Selector](/usage/instance-selector) diff --git a/userdocs/src/usage/troubleshooting.md b/userdocs/src/usage/troubleshooting.md index 96d7169f23..02627bb40a 100755 --- a/userdocs/src/usage/troubleshooting.md +++ b/userdocs/src/usage/troubleshooting.md @@ -60,4 +60,4 @@ or Error from server (InternalError): Internal error occurred: Authorization error (user=kube-apiserver-kubelet-client, verb=get, resource=nodes, subresource=proxy) ``` -and your nodes are deployed in a private subnet you may need to set [enableDnsHostnames](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-dns.html#vpc-dns-support). More details can be found in [this issue](https://github.com/weaveworks/eksctl/issues/4645). +and your nodes are deployed in a private subnet you may need to set [enableDnsHostnames](https://docs.aws.amazon.com/vpc/latest/userguide/vpc-dns.html#vpc-dns-support). More details can be found in [this issue](https://github.com/eksctl-io/eksctl/issues/4645). diff --git a/userdocs/src/usage/unowned-clusters.md b/userdocs/src/usage/unowned-clusters.md index f691e7a498..af6ea43dfd 100644 --- a/userdocs/src/usage/unowned-clusters.md +++ b/userdocs/src/usage/unowned-clusters.md @@ -11,7 +11,7 @@ not created by `eksctl`. The following commands can be used against clusters created by any means other than `eksctl`. The commands, flags and config file options can be used in exactly the same way. -If we have missed some functionality, please [let us know](https://github.com/weaveworks/eksctl/issues). +If we have missed some functionality, please [let us know](https://github.com/eksctl-io/eksctl/issues). - [x] Create: - [x] `eksctl create nodegroup` ([see note below](#creating-nodegroups)) diff --git a/userdocs/src/usage/vpc-configuration.md b/userdocs/src/usage/vpc-configuration.md index 167c6857ab..b514f48923 100644 --- a/userdocs/src/usage/vpc-configuration.md +++ b/userdocs/src/usage/vpc-configuration.md @@ -175,8 +175,8 @@ nodeGroups: More examples can be found in the repo's `examples` folder: -- [using an existing VPC](https://github.com/weaveworks/eksctl/blob/master/examples/04-existing-vpc.yaml) -- [using a custom VPC CIDR](https://github.com/weaveworks/eksctl/blob/master/examples/02-custom-vpc-cidr-no-nodes.yaml) +- [using an existing VPC](https://github.com/eksctl-io/eksctl/blob/master/examples/04-existing-vpc.yaml) +- [using a custom VPC CIDR](https://github.com/eksctl-io/eksctl/blob/master/examples/02-custom-vpc-cidr-no-nodes.yaml) ## Custom Shared Node Security Group @@ -220,7 +220,7 @@ vpc: gateway: HighlyAvailable # other options: Disable, Single (default) ``` -See the complete example [here](https://github.com/weaveworks/eksctl/blob/master/examples/09-nat-gateways.yaml). +See the complete example [here](https://github.com/eksctl-io/eksctl/blob/master/examples/09-nat-gateways.yaml). **Note**: Specifying the NAT Gateway is only supported during cluster creation. It isn't touched during a cluster upgrade. There are plans to support changing between different modes on cluster update in the future. diff --git a/userdocs/src/usage/vpc-subnet-settings.md b/userdocs/src/usage/vpc-subnet-settings.md index fd15a91916..b0fc8eceb7 100644 --- a/userdocs/src/usage/vpc-subnet-settings.md +++ b/userdocs/src/usage/vpc-subnet-settings.md @@ -99,5 +99,5 @@ nodeGroups: - private-one ``` -See [here](https://github.com/weaveworks/eksctl/blob/master/examples/24-nodegroup-subnets.yaml) for a full +See [here](https://github.com/eksctl-io/eksctl/blob/master/examples/24-nodegroup-subnets.yaml) for a full configuration example. diff --git a/userdocs/theme/assets/adopters/aws-logo.png b/userdocs/theme/assets/adopters/aws-logo.png new file mode 100644 index 0000000000..e50388ad94 Binary files /dev/null and b/userdocs/theme/assets/adopters/aws-logo.png differ diff --git a/userdocs/theme/assets/adopters/gophers.png b/userdocs/theme/assets/adopters/gophers.png new file mode 100644 index 0000000000..aaa63a3d4a Binary files /dev/null and b/userdocs/theme/assets/adopters/gophers.png differ diff --git a/userdocs/theme/assets/adopters/placeholder.svg b/userdocs/theme/assets/adopters/placeholder.svg new file mode 100644 index 0000000000..639b475915 --- /dev/null +++ b/userdocs/theme/assets/adopters/placeholder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/userdocs/theme/assets/adopters/weave-logo.png b/userdocs/theme/assets/adopters/weave-logo.png new file mode 100644 index 0000000000..b6d4f47e39 Binary files /dev/null and b/userdocs/theme/assets/adopters/weave-logo.png differ diff --git a/userdocs/theme/assets/images/cluster-demo.png b/userdocs/theme/assets/images/cluster-demo.png new file mode 100644 index 0000000000..a5aed81897 Binary files /dev/null and b/userdocs/theme/assets/images/cluster-demo.png differ diff --git a/userdocs/theme/assets/images/favicon.png b/userdocs/theme/assets/images/favicon.png deleted file mode 100644 index c055a1abd9..0000000000 Binary files a/userdocs/theme/assets/images/favicon.png and /dev/null differ diff --git a/userdocs/theme/assets/images/illustration.png b/userdocs/theme/assets/images/illustration.png new file mode 100644 index 0000000000..69f739c057 Binary files /dev/null and b/userdocs/theme/assets/images/illustration.png differ diff --git a/userdocs/theme/assets/images/logo.png b/userdocs/theme/assets/images/logo.png deleted file mode 100644 index f9678eb279..0000000000 Binary files a/userdocs/theme/assets/images/logo.png and /dev/null differ diff --git a/userdocs/theme/assets/images/outposts.png b/userdocs/theme/assets/images/outposts.png new file mode 100644 index 0000000000..b2659d12e5 Binary files /dev/null and b/userdocs/theme/assets/images/outposts.png differ diff --git a/userdocs/theme/home.html b/userdocs/theme/home.html new file mode 100644 index 0000000000..c7e990f079 --- /dev/null +++ b/userdocs/theme/home.html @@ -0,0 +1,673 @@ +{% extends "main.html" %} + + +{% block tabs %} + {{ super() }} + + + +
    + +
    +
    + + + +
    +
    +
    +

    {{ config.site_description }}.

    +

    eksctl is a simple CLI tool for creating and managing clusters on EKS - Amazon's managed Kubernetes service for EC2.

    + Get started + Learn more +
    +
    + + {% include ".icons/fontawesome/solid/arrow-down-long.svg" %} + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +

    Create a basic cluster in minutes with just one command. + +

    +
    +
    +
    + Getting started +
    +

    eksctl create cluster

    +

    A cluster will be created with default parameters:

    +
      +
    • exciting auto-generated name, e.g., fabulous-mushroom-1527688624
      • +
    • two m5.large worker nodes (this instance type suits most common use-cases, and is good value for money)
      • +
    • use the official AWS EKS AMI
      • +
    • us-west-2 region
      • +
    • a dedicated VPC (check your quotas)
      • +
    +

    + + {% include ".icons/octicons/arrow-right-16.svg" %} + Learn more +

    +
    +
    +
    + Usage Outposts +
    +

    New for {{ build_date_utc.strftime('%Y') }}

    +

    Creating fully private clusters on AWS Outposts.

    +

    Supported Regions - Zurich (eu-central-2), + Spain (eu-south-2), + Hyderabad (ap-south-2), + Melbourne (ap-southeast-4), + Tel Aviv (il-central-1), + US ISO - (us-iso-east-1 and us-isob-east-1) +

    +

    EKS supported versions 1.25, 1.26, 1.27 (default) and 1.28.

    +

    + + {% include ".icons/octicons/arrow-right-16.svg" %} + Learn more +

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +

    Community + + {% include ".icons/octicons/heart-fill-24.svg" %} + + +

    +
    +
    +
      +
    • +
      + + {% include ".icons/fontawesome/brands/github.svg" %} + +
      +
      +

      Github

      +

      Create an issue to Propose a feature request, Suggest an improvement, Report a Bug or Open a Help ticket on Github.

      +
      +
      • +
    • +
      + + {% include ".icons/fontawesome/brands/slack.svg" %} + +
      +
      +

      Slack

      +

      Have a question or need help? Ask a question on our Slack channel and get in touch with our community by joining Kubernetes Slack.

      +
      +
      • +
    • +
      + + {% include ".icons/octicons/git-pull-request-16.svg" %} + +
      +
      +

      Contributing

      +

      Read more about Contributing to eksctl repository here.

      +
      +
      • +
    • +
      + + {% include ".icons/octicons/people-16.svg" %} + +
      +
      +

      Code of Conduct

      +

      Find out more about eksctl Community and Code of Conduct here.

      +
      +
      • +
    +
    +
    +

    Eksctl Maintainers

    +
    +
    +
    Himangini
    +
    cPu1
    +
    TiberiuGC
    +
    yuxiang-zhang
    +
    a-hilaly
    +
    +
    +

    Thank you eksctl contributors all your contributions.{% include ".icons/octicons/star-16.svg" %}

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +

    sponsored by Weaveworks + and built by contributors Contributors + on Github +

    +

    + Site powered by Netlify © +
    + Copyright © {{ build_date_utc.strftime('%Y') }} Weaveworks +
    + Made with + + Material for MkDocs + +

    +
    +
    +
    +
    +
    +{% endblock %} + + +{% block content %}{% endblock %} + + +{% block footer %}{% endblock %} \ No newline at end of file diff --git a/userdocs/theme/main.html b/userdocs/theme/main.html index 94d9808cc7..3ac5095c4d 100644 --- a/userdocs/theme/main.html +++ b/userdocs/theme/main.html @@ -1 +1,17 @@ {% extends "base.html" %} + +{% block announce %} + +

    + eksctl has now moved to a new GitHub Organisation. For more details check out + Weaveworks Blog + and AWS Blog posts. +

    +{% endblock %} + + +{% block scripts %} + + {{ super() }} + +{% endblock %} \ No newline at end of file diff --git a/userdocs/theme/partials/copyright.html b/userdocs/theme/partials/copyright.html index 14e42b9277..1132fd4cd2 100644 --- a/userdocs/theme/partials/copyright.html +++ b/userdocs/theme/partials/copyright.html @@ -1,6 +1,23 @@
    +

    Eksctl Adopters

    +

    We are happy and proud to have you all as part of our community! + + {% include ".icons/octicons/heart-fill-24.svg" %} + + To join the list of eksctl adopters, please follow these instructions. +

    +
    +
    +
      +
    • AWS logo
      • +
    • Weaveworks logo
      • +
    • Gophers
      • + +
    +
    +

    Gophers: E, K, S, C, T, & L

    -

    Original Gophers drawn by Ashley McNamara, unique E, K, S, C, T & L Gopher identities had been produced with Gopherize.me.

    +

    Original Gophers drawn by Ashley McNamara, unique E, K, S, C, T & L Gopher identities had been produced with Gopherize.me.

    Site powered by Netlify ©

    Copyright © {{ build_date_utc.strftime('%Y') }} Weaveworks