diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml index b656d5a5..ccd08969 100644 --- a/.github/actions/acc_test/action.yaml +++ b/.github/actions/acc_test/action.yaml @@ -2,19 +2,14 @@ name: Acceptance Testing description: "Acceptance Testing pipeline" inputs: - tf_debug: - description: "enable terraform debug logs" - default: 'false' - required: true - test_timeout_string: description: "string that determines the timeout (default: 45m)" - default: '90m' + default: '45m' required: true go-version: description: "go version to install" - default: '1.26' + default: '1.25' required: true project_id: @@ -65,18 +60,20 @@ inputs: description: "testfile to run" default: '' -outputs: - result: - value: ${{ steps.testrun.outputs.result }} - description: "the output of the tests" - status: - value: ${{ steps.status.outputs.status }} - description: "the status of the tests" +#outputs: +# random-number: +# description: "Random number" +# value: ${{ steps.random-number-generator.outputs.random-number }} runs: using: "composite" steps: +# - name: Random Number Generator +# id: random-number-generator +# run: echo "random-number=$(echo $RANDOM)" >> $GITHUB_OUTPUT +# shell: bash + - name: Install needed tools shell: bash run: | @@ -92,15 +89,6 @@ runs: fi echo "::endgroup::" - # Install latest version of Terraform - - uses: hashicorp/setup-terraform@v4 - with: - terraform_wrapper: false - - - uses: actions/setup-node@v6 - with: - node-version: '24.x' - - name: Setup JAVA uses: actions/setup-java@v5 with: @@ -153,12 +141,6 @@ runs: ${{ steps.goenv.outputs.gomodcache }} key: ${{ runner.os }}-gopkg - - name: Define service account file path variable - id: service_account - shell: bash - run: | - echo "safilepath=${PWD}/stackit/${{ inputs.service_account_json_file_path }}" >> "$GITHUB_OUTPUT" - - name: Creating service_account file from json input if: inputs.service_account_json_content != '' shell: bash @@ -203,35 +185,15 @@ runs: ls -l stackit/"${{ inputs.service_account_json_file_path }}" echo "::endgroup::" - - name: Run acceptance tests - id: testrun + - name: Run acceptance test file + if: ${{ inputs.test_file != '' }} shell: bash run: | - echo "::group::go test" + echo "::group::go test file" set -e set -o pipefail - - if [[ "${{ inputs.tf_debug }}" == "true" ]]; then - TF_LOG=INFO - export TF_LOG - fi - - testfile="${{ inputs.test_file }}" - - echo "result=no result before run" >> "$GITHUB_OUTPUT" echo "Running acceptance tests for the terraform provider" - - if [[ -z "$testfile" ]]; then - testfile="./..." - fi - - if [[ -z "$testfile" ]]; then - echo "ERROR: No test file provided" - exit 1 - fi - - set +e cd stackit || exit 1 TF_ACC=1 \ TF_ACC_PROJECT_ID=${TF_ACC_PROJECT_ID} \ @@ -242,21 +204,7 @@ runs: TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \ TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \ TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \ - go test -v ${testfile} -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log - set -e - - have_fail=$(cat acc_test_run.log | grep FAIL) - if [[ -n $have_fail ]]; then - echo "::endgroup::" - echo "::group::go test result" - echo "Test failed, see acc_test_run.log for details" - echo "${have_fail}" - echo "result=FAIL:
${have_fail}" >> "$GITHUB_OUTPUT" - echo "::endgroup::" - exit 1 - fi - - echo "result=no FAIL detected" >> "$GITHUB_OUTPUT" + go test ${{ inputs.test_file }} -count=1 -timeout=${{ inputs.test_timeout_string }} echo "::endgroup::" env: TF_ACC_PROJECT_ID: ${{ inputs.project_id }} @@ -267,16 +215,48 @@ runs: TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }} TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }} - - name: Set status output variable - if: always() - id: status +# - name: Run test action +# if: ${{ inputs.test_file == '' }} +# env: +# TF_ACC: 1 +# TF_ACC_PROJECT_ID: ${{ inputs.project_id }} +# TF_ACC_REGION: ${{ inputs.region }} +# TF_ACC_TEST_PROJECT_USER_EMAIL: ${{ inputs.project_user_email }} +# TF_ACC_KEK_KEY_ID: ${{ inputs.tf_acc_kek_key_id }} +# TF_ACC_KEK_KEY_RING_ID: ${{ inputs.tf_acc_kek_key_ring_id }} +# TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }} +# TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }} +# TF_ACC_SERVICE_ACCOUNT_FILE: "${PWD}/${{ inputs.service_account_json_file_path }}" +# uses: robherley/go-test-action@v0.1.0 +# with: +# testArguments: "./... -timeout 45m" + + - name: Run acceptance tests + if: ${{ inputs.test_file == '' }} shell: bash run: | - echo "status=${{ steps.testrun.outcome == 'success' && 'SUCCESS' || 'FAILURE' }}" >> "$GITHUB_OUTPUT" + echo "::group::go test all" + set -e + set -o pipefail - - name: Upload test log artifact - if: always() - uses: actions/upload-artifact@v3 - with: - name: acc_test.log - path: "stackit/acc_test_run.log" + echo "Running acceptance tests for the terraform provider" + cd stackit || exit 1 + TF_ACC=1 \ + TF_ACC_PROJECT_ID=${TF_ACC_PROJECT_ID} \ + TF_ACC_REGION=${TF_ACC_REGION} \ + TF_ACC_TEST_PROJECT_USER_EMAIL=${TF_ACC_TEST_PROJECT_USER_EMAIL} \ + TF_ACC_SERVICE_ACCOUNT_FILE="${PWD}/${{ inputs.service_account_json_file_path }}" \ + TF_ACC_KEK_KEY_ID=${TF_ACC_KEK_KEY_ID} \ + TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \ + TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \ + TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \ + go test ./... -count=1 -timeout=${{ inputs.test_timeout_string }} + echo "::endgroup::" + env: + TF_ACC_PROJECT_ID: ${{ inputs.project_id }} + TF_ACC_REGION: ${{ inputs.region }} + TF_ACC_TEST_PROJECT_USER_EMAIL: ${{ inputs.project_user_email }} + TF_ACC_KEK_KEY_ID: ${{ inputs.tf_acc_kek_key_id }} + TF_ACC_KEK_KEY_RING_ID: ${{ inputs.tf_acc_kek_key_ring_id }} + TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }} + TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }} diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml index b9256143..7bea976a 100644 --- a/.github/actions/build/action.yaml +++ b/.github/actions/build/action.yaml @@ -3,7 +3,7 @@ description: "Build pipeline" inputs: go-version: description: "Go version to install" - default: '1.26' + default: '1.25' required: true java-distribution: description: "JAVA distribution to use (default: temurin)" diff --git a/.github/actions/clean_up/README.md b/.github/actions/clean_up/README.md deleted file mode 100644 index c3484cf2..00000000 --- a/.github/actions/clean_up/README.md +++ /dev/null @@ -1 +0,0 @@ -# acceptance test action diff --git a/.github/actions/clean_up/action.yaml b/.github/actions/clean_up/action.yaml deleted file mode 100644 index c8e142fa..00000000 --- a/.github/actions/clean_up/action.yaml +++ /dev/null @@ -1,227 +0,0 @@ -name: CleanUp Project Resources -description: "Acceptance Testing CleanUp" - -inputs: - project_id: - description: "STACKIT project ID for tests" - required: true - - region: - description: "STACKIT region for tests" - default: 'eu01' - required: true - - tf_resource_prefix: - description: "prefix in resource names" - default: 'tf-acc-' - required: true - - service_account_json_content: - description: "STACKIT service account JSON file contents" - required: true - default: '' - - service_account_json_content_b64: - description: "STACKIT service account JSON file contents" - required: true - default: '' - - list_only: - description: "only list resources, DO NOT delete" - required: true - default: 'true' - - log_level: - description: "Log Level" - required: true - default: 'warning' - -outputs: - cli-version: - description: "stackit cli version" - value: ${{ steps.stackit_version.outputs.version }} - - pre_count: - description: "number of resources found" - value: ${{ steps.retrieve_pre.outputs.count }} - - post_count: - description: "number of resources found" - value: ${{ steps.retrieve_post.outputs.count }} - - status: - description: "status of the test" - value: ${{ steps.status.outputs.status }} - -runs: - using: "composite" - steps: - - name: Install needed tools - shell: bash - run: | - echo "::group::apt install" - set -e - apt-get -y -qq update >apt_update.log 2>apt_update_err.log - if [ $? -ne 0 ]; then - cat apt_update.log apt_update_err.log - fi - apt-get -y -qq install curl gnupg jq >apt_get.log 2>apt_get_err.log - if [ $? -ne 0 ]; then - cat apt_get.log apt_get_err.log - fi - echo "::endgroup::" - - echo "::group::apt add source" - curl https://packages.stackit.cloud/keys/key.gpg | gpg --dearmor -o /usr/share/keyrings/stackit.gpg - echo "deb [signed-by=/usr/share/keyrings/stackit.gpg] https://packages.stackit.cloud/apt/cli stackit main" | tee -a /etc/apt/sources.list.d/stackit.list - echo "::endgroup::" - - echo "::group::apt install stackit cli" - apt-get -y -qq update >apt_update.log 2>apt_update_err.log - if [ $? -ne 0 ]; then - cat apt_update.log apt_update_err.log - fi - apt-get -y -qq install stackit >apt_get.log 2>apt_get_err.log - if [ $? -ne 0 ]; then - cat apt_get.log apt_get_err.log - fi - echo "::endgroup::" - - - name: Check stackit cli version - id: stackit_version - run: | - set -e - VERSION=$(stackit --version | grep "Version:" | cut -d " " -f 2) - echo "stackit cli version: ${VERSION}" - echo "version=${VERSION}" >> $GITHUB_OUTPUT - shell: bash - - - name: Creating service_account file from json input - if: inputs.service_account_json_content != '' - shell: bash - run: | - echo "::group::create service account file" - set -e - set -o pipefail - - echo "${{ inputs.service_account_json_content }}" > .svc_acc.json - echo "::endgroup::" - - - name: Creating service_account file from base64 json input - if: inputs.service_account_json_content_b64 != '' - shell: bash - run: | - echo "::group::create service account file" - set -e - set -o pipefail - - echo "${{ inputs.service_account_json_content_b64 }}" | base64 -d > .svc_acc.json - echo "::endgroup::" - - - name: Check service account file exists - shell: bash - run: | - set -e - if [[ ! -s .svc_acc.json ]]; then - echo "ERROR: service account file missing or empty" - exit 1 - fi - - - name: Retrieve resources before - id: retrieve_pre - run: | - echo "::group::retrieve resources" - set -e - echo "authenticating api" - STACKIT_SERVICE_ACCOUNT_KEY_PATH="${PWD}/.svc_acc.json" - export STACKIT_SERVICE_ACCOUNT_KEY_PATH - stackit auth activate-service-account --service-account-key-path .svc_acc.json - - echo "SQL Server Flex resources:" - sql_res=$(stackit --verbosity ${{ inputs.log_level }} --project-id "${{ inputs.project_id }}" beta sqlserverflex instance list --output-format json | jq -r '.[] | select(.name | startswith("${{ inputs.tf_resource_prefix }}"))') - sql_count=$(echo "$sql_res" | jq -r '.id' | wc -l) - - echo "PostgreSQL Flex resources:" - pg_res=$(stackit --verbosity ${{ inputs.log_level }} --project-id "${{ inputs.project_id }}" postgresflex instance list --output-format json | jq -r '.[] | select(.name | startswith("${{ inputs.tf_resource_prefix }}"))') - pg_count=$(echo "$pg_res" | jq -r '.id' | wc -l) - - echo "Number of resources found: ${sql_count} SQL Server Flex, ${pg_count} PostgreSQL Flex" - echo "count=$(( ${pg_count} + ${sql_count} ))" >> $GITHUB_OUTPUT - echo "::endgroup::" - shell: bash - - - name: Delete SQL Server Flex resources - if: ${{ inputs.list_only != 'true' }} - id: del_sql - run: | - echo "::group::delete SQL Server Flex resources" - stackit --verbosity ${{ inputs.log_level }} auth activate-service-account --service-account-key-path .svc_acc.json - for s in $(stackit --verbosity ${{ inputs.log_level }} --project-id ${{ inputs.project_id }} beta sqlserverflex instance list --output-format json | jq -r '.[] | select(.name | startswith("${{ inputs.tf_resource_prefix }}")) | .id'); - do - stackit --verbosity ${{ inputs.log_level }} -y --project-id ${{ inputs.project_id }} beta sqlserverflex instance delete $s || echo "status=FAILURE" >> ${GITHUB_OUTPUT}; - done - echo "::endgroup::" - shell: bash - - - name: Skip Delete SQL Server Flex resources - if: ${{ inputs.list_only == 'true' }} - run: | - set -e - echo "Skip deleting: list only mode" - shell: bash - - - name: Delete PostgreSQL Flex resources - if: ${{ inputs.list_only != 'true' }} - id: del_pg - run: | - echo "::group::delete PostgreSQL Flex resources" - stackit auth activate-service-account --service-account-key-path .svc_acc.json - for s in $(stackit --verbosity ${{ inputs.log_level }} --project-id ${{ inputs.project_id }} postgresflex instance list --output-format json | jq -r '.[] | select(.name | startswith("${{ inputs.tf_resource_prefix }}")) | .id'); - do - stackit --verbosity ${{ inputs.log_level }} -y --project-id ${{ inputs.project_id }} postgresflex instance delete "$s" --force || echo "status=FAILURE" >> ${GITHUB_OUTPUT}; - done - echo "::endgroup::" - shell: bash - - - name: Skip Delete PostgreSQL Flex resources - if: ${{ inputs.list_only == 'true' }} - run: | - set -e - echo "Skip deleting: list only mode" - shell: bash - - - name: Retrieve resources after - id: retrieve_post - run: | - echo "::group::retrieve resources" - set -e - echo "authenticating api" - STACKIT_SERVICE_ACCOUNT_KEY_PATH="${PWD}/.svc_acc.json" - export STACKIT_SERVICE_ACCOUNT_KEY_PATH - stackit auth activate-service-account --service-account-key-path .svc_acc.json - - echo "SQL Server Flex resources:" - sql_res=$(stackit --verbosity ${{ inputs.log_level }} --project-id "${{ inputs.project_id }}" beta sqlserverflex instance list --output-format json | jq -r '.[] | select(.name | startswith("${{ inputs.tf_resource_prefix }}"))') - sql_count=$(echo "$sql_res" | jq -r '.id' | wc -l) - - echo "PostgreSQL Flex resources:" - pg_res=$(stackit --verbosity ${{ inputs.log_level }} --project-id "${{ inputs.project_id }}" postgresflex instance list --output-format json | jq -r '.[] | select(.name | startswith("${{ inputs.tf_resource_prefix }}"))') - pg_count=$(echo "$pg_res" | jq -r '.id' | wc -l) - - echo "Number of resources found: ${sql_count} SQL Server Flex, ${pg_count} PostgreSQL Flex" - echo "count=$(( ${pg_count} + ${sql_count} ))" >> $GITHUB_OUTPUT - echo "::endgroup::" - shell: bash - - - name: Set status - if: always() - id: status - run: | - status="SUCCESS" - if [[ "${{ steps.del_pg.outputs.status }}" == "FAILURE" ]]; then - status=FAILURE" - elif [[ "${{ steps.del_sql.outputs.status }}" == "FAILURE" ]]; then - status=FAILURE" - fi - echo "status=$status" >> $GITHUB_OUTPUT - shell: bash diff --git a/.github/actions/notify/action.yaml b/.github/actions/notify/action.yaml deleted file mode 100644 index bc4205c6..00000000 --- a/.github/actions/notify/action.yaml +++ /dev/null @@ -1,148 +0,0 @@ -name: Send notification via Google Chat -description: "Sends a notification to a Google Chat room when a pull request is opened." - -inputs: - webhook_url: - description: "The URL of the Google Chat webhook." - required: true - - title: - description: "The title of the notification." - required: true - - subtitle: - description: "The subtitle of the notification." - default: 'no subtitle provided' - - image_slug: - description: "The slug of the image to be included in the notification." - default: 'git' - - event_author: - description: "The author of the event." - default: 'unknown' - - event_title: - description: "The title of the event." - required: true - - event_body: - description: "The body of the event." - default: 'no body provided' - - event_number: - description: "The number of the event." - default: 'no number provided' - - event_url: - description: "The url of the event." - default: 'none' - - status: - description: "The status of the event." - default: 'UNKNOWN' - -runs: - using: "composite" - steps: - - name: Install prerequisites - shell: bash - run: | - echo "::group::apt install" - set -e - apt update - apt install -y curl jq - echo "::endgroup::" - - - name: Determine status color - id: status - shell: bash - run: | - case "${{ inputs.status }}" in - SUCCESS) - STATUS_COLOR="006400/228b22" - ADD='{"decoratedText": {"startIcon": {"materialIcon": {"name": "check_circle"}},"text": "SUCCESS"}},' - ;; - FAILURE) - STATUS_COLOR="8b0000/dc143c" - ADD='{"decoratedText": {"startIcon": {"materialIcon": {"name": "stop_circle"}},"text": "FAILURE"}},' - ;; - *) - STATUS_COLOR="483d8b/6495ed" - ADD='' - ;; - esac - echo "color=${STATUS_COLOR}" >> "$GITHUB_OUTPUT" - echo "status_add=${ADD}" >> "$GITHUB_OUTPUT" - - - name: Notify via Google Chat Webhook - shell: bash - env: - WEBHOOK: ${{ inputs.webhook_url }} - run: | - set -e - - PAYLOAD=$(jq -n -r \ - --arg header "${{ inputs.title }}" \ - --arg subtitle "${{ inputs.subtitle }}" \ - --arg imgurl "https://cdn.simpleicons.org/${{ inputs.image_slug }}/${{ steps.status.outputs.color }}" \ - --arg title "${{ inputs.event_title || 'no event title given' }}" \ - --arg body "${{ inputs.event_body || 'no event body given' }}" \ - --arg author "${{ inputs.event_author || 'no event author given' }}" \ - --arg url "${{ inputs.event_url || github.repositoryUrl || github.server_url }}" \ - '{ "cardsV2": [ { "cardId": "notify-${{ github.run_id }}", "card": { - "header": { - "title": "\($header)", - "subtitle": "\($subtitle)", - "imageUrl": "\($imgurl)", - "imageType": "SQUARE" - }, - "sections": [ - { - "header": "\($title)", - "collapsible": false, - "widgets": [ - ${{ steps.status.outputs.status_add }} - { - "decoratedText": { - "startIcon": { - "knownIcon": "PERSON" - }, - "text": "\($author)" - } - }, - { - "textParagraph": { - "text": "\($body)", - "maxLines": 2 - } - } - ] - }, - { - "widgets": [ - { - "buttonList": { - "buttons": [ - { - "text": "View Source Event", - "type": "FILLED", - "onClick": { - "openLink": { - "url": "\($url)" - } - } - } - ] - } - } - ] - } - ] - }} ] }') - - curl \ - -X POST \ - -H 'Content-Type: application/json' \ - "${{ inputs.webhook_url }}&threadKey=run${{ github.run_id }}&messageReplyOption=REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD" \ - -d "${PAYLOAD}" diff --git a/.github/actions/setup-cache-go/action.yaml b/.github/actions/setup-cache-go/action.yaml index eb12595f..d352db76 100644 --- a/.github/actions/setup-cache-go/action.yaml +++ b/.github/actions/setup-cache-go/action.yaml @@ -10,7 +10,7 @@ inputs: go-version: description: "go version to install" - default: '1.26' + default: '1.25' required: true runs: diff --git a/.github/workflows/ci_new.yaml b/.github/workflows/ci_new.yaml index 61288df4..35deb76c 100644 --- a/.github/workflows/ci_new.yaml +++ b/.github/workflows/ci_new.yaml @@ -2,7 +2,6 @@ name: CI Workflow on: pull_request: - types: [ opened, synchronize, reopened ] branches: - alpha - main @@ -28,24 +27,11 @@ jobs: config: if: ${{ github.event_name != 'schedule' }} name: Check GoReleaser config - runs-on: stackit-docker + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v6 - - name: Notify - if: always() - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[START] CI pipeline (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.event_name }} on ${{ forgejo.ref_name }}" - event_title: "${{ forgejo.event_name }} for ${{ forgejo.repository }}" - event_author: ${{ forgejo.actor }} - event_body: "${{ forgejo.event_name }} on ${{ forgejo.ref }} for ${{ forgejo.repository }}" - event_number: ${{ forgejo.run_number }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - - name: Check GoReleaser uses: goreleaser/goreleaser-action@v7 with: @@ -53,7 +39,7 @@ jobs: prepare: name: Prepare GO cache - runs-on: stackit-docker + runs-on: ubuntu-latest permissions: actions: read # Required to identify workflow run. checks: write # Required to add status summary. @@ -115,7 +101,7 @@ jobs: needs: - config - prepare - runs-on: stackit-docker + runs-on: ubuntu-latest permissions: actions: read # Required to identify workflow run. checks: write # Required to add status summary. @@ -198,7 +184,7 @@ jobs: testing: name: CI run tests - runs-on: stackit-docker + runs-on: ubuntu-latest needs: - config - prepare @@ -232,21 +218,11 @@ jobs: run: go mod tidy - name: Testing - if: ${{ github.event_name != 'pull_request' }} run: | - unset TF_ACC TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json export TF_ACC_SERVICE_ACCOUNT_FILE make test - - name: Testing with coverage - if: ${{ github.event_name == 'pull_request' }} - run: | - unset TF_ACC - TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json - export TF_ACC_SERVICE_ACCOUNT_FILE - make coverage - # - name: Acceptance Testing # env: # TF_ACC: "1" @@ -256,20 +232,20 @@ jobs: # export TF_ACC_SERVICE_ACCOUNT_FILE # make test-acceptance-tf -# - name: Run Acceptance Test -# if: ${{ github.event_name == 'pull_request' }} -# uses: ./.github/actions/acc_test -# with: -# go-version: ${{ env.GO_VERSION }} -# project_id: ${{ vars.TF_ACC_PROJECT_ID }} -# region: ${{ vars.TF_ACC_REGION }} -# service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}" -# project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }} -# tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }} -# tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }} -# tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }} -# tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }} -# # service_account_json_file_path: "~/service_account.json" + - name: Run Test + if: ${{ github.event_name == 'pull_request' }} + uses: ./.github/actions/acc_test + with: + go-version: ${{ env.GO_VERSION }} + project_id: ${{ vars.TF_ACC_PROJECT_ID }} + region: ${{ vars.TF_ACC_REGION }} + service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}" + project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }} + tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }} + tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }} + tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }} + tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }} + # service_account_json_file_path: "~/service_account.json" - name: Check coverage threshold shell: bash @@ -291,7 +267,7 @@ jobs: main: if: ${{ github.event_name != 'schedule' }} name: CI run build and linting - runs-on: stackit-docker + runs-on: ubuntu-latest needs: - config - prepare @@ -342,7 +318,7 @@ jobs: code_coverage: name: "Code coverage report" if: github.event_name == 'pull_request' # Do not run when workflow is triggered by push to main branch - runs-on: stackit-docker + runs-on: ubuntu-latest needs: - main - prepare diff --git a/.github/workflows/clean_up.yaml b/.github/workflows/clean_up.yaml deleted file mode 100644 index e1cc291b..00000000 --- a/.github/workflows/clean_up.yaml +++ /dev/null @@ -1,72 +0,0 @@ -name: TF Acceptance Test CleanUp - -on: - workflow_dispatch: - inputs: - list_only: - description: "only list resources" - type: boolean - default: true - required: true - - res_prefix: - description: "resource name prefix" - type: string - default: 'tf-acc-' - required: true - - log_level: - description: 'Log Level' - required: true - default: 'warning' - type: choice - options: - - info - - warning - - debug - - error - -jobs: - clean: - name: Clean up - runs-on: stackit-docker - steps: - - name: Checkout - uses: actions/checkout@v6 - - - name: Notify - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[START] CLEAN UP pipeline (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.repository }}" - event_title: ${{ forgejo.event_name }} - event_author: ${{ forgejo.actor }} - event_body: "try to remove all resources with prefix ${{ inputs.res_prefix }}" - event_number: ${{ forgejo.run_number }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - - - name: Clean - id: clean - uses: ./.github/actions/clean_up - with: - project_id: ${{ vars.TF_ACC_PROJECT_ID }} - region: 'eu01' - tf_resource_prefix: ${{ inputs.res_prefix }} - service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}" - list_only: ${{ inputs.list_only }} - log_level: ${{ inputs.log_level }} - - - name: Notify - if: always() - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[END] CLEAN UP pipeline (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.repository }}" - event_title: ${{ forgejo.event_name }} - event_author: ${{ forgejo.actor }} - event_body: "count before cleaning: ${{ steps.clean.outputs.pre_count }}
count after cleaning: ${{ steps.clean.outputs.post_count }}" - event_number: ${{ forgejo.run_number }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - status: ${{ steps.clean.outcome == 'success' && 'SUCCESS' || 'FAILURE' }} diff --git a/.github/workflows/notify_pr.yaml b/.github/workflows/notify_pr.yaml deleted file mode 100644 index fd84a220..00000000 --- a/.github/workflows/notify_pr.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: Notify on new PR - -on: - pull_request: - types: - - opened - -jobs: - notify: - name: Notify via Google Chat - runs-on: stackit-docker - steps: - - name: Checkout - uses: actions/checkout@v6 - - - name: Notify - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "New Pull Request" - event_title: "${{ github.event.pull_request.title }}" - event_author: "${{ github.event.pull_request.user.login }}" - event_body: "${{ github.event.pull_request.body || 'No description provided.' }}" - event_number: "${{ github.event.pull_request.number }}" - event_url: "${{ github.event.pull_request.html_url }}" diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a5520ea0..e6245e52 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -4,10 +4,9 @@ run-name: Publish by @${{ github.actor }} on: workflow_dispatch: - push: tags: - - 'v*' + - 'v0.*' env: GO_VERSION: "1.25" @@ -17,12 +16,11 @@ env: jobs: config: name: Check GoReleaser config + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v6 - with: - fetch-tags: true - name: Check GoReleaser uses: goreleaser/goreleaser-action@v7 @@ -31,12 +29,13 @@ jobs: publish: name: "Publish provider" + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') needs: config runs-on: ubuntu-latest permissions: actions: read # Required to identify workflow run. checks: write # Required to add status summary. - contents: write # Required to checkout repository. + contents: read # Required to checkout repository. pull-requests: write # Required to add PR comment. steps: - name: Install needed tools @@ -46,20 +45,6 @@ jobs: - name: Checkout uses: actions/checkout@v6 - with: - fetch-tags: true - - - name: Notify - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[START] Publish (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.event_name }} on branch ${{ forgejo.ref }}" - event_title: "run started" - event_author: ${{ forgejo.actor }} - event_body: "" - event_number: ${{ forgejo.event.id }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - name: Setup Go uses: actions/setup-go@v6 @@ -97,7 +82,7 @@ jobs: gpg --import ~/private.key.pem rm ~/private.key.pem - - name: Run GoReleaser + - name: Run GoReleaser with SNAPSHOT if: github.event_name == 'workflow_dispatch' id: goreleaser env: @@ -105,8 +90,7 @@ jobs: GPG_FINGERPRINT: ${{ secrets.GPG_FINGERPRINT }} uses: goreleaser/goreleaser-action@v7 with: -# args: release --skip publish --clean --snapshot - args: release --skip publish --clean + args: release --skip publish --clean --snapshot - name: Run GoReleaser if: github.event_name != 'workflow_dispatch' @@ -122,15 +106,9 @@ jobs: run: | echo "${{ secrets.PUBLIC_KEY_PEM }}" >public_key.pem - - name: Determine version - id: get_version - run: | - set -e - VERSION=$(jq -r .version < dist/metadata.json) - echo "version=${VERSION}" >> "$GITHUB_OUTPUT" - - name: Prepare provider directory structure run: | + VERSION=$(jq -r .version < dist/metadata.json) go run generator/main.go \ publish \ --namespace=mhenselin \ @@ -139,16 +117,9 @@ jobs: --domain=tfregistry.sysops.stackit.rocks \ --gpgFingerprint="${{ secrets.GPG_FINGERPRINT }}" \ --gpgPubKeyFile=public_key.pem \ - --version=${{ steps.get_version.outputs.version }} - - - name: Prepare documentation nav file - run: | - go run generator/main.go \ - docs \ - --outFile nav.md + --version=${VERSION} - name: Publish provider to S3 - id: publish_to_s3 run: | set -e cd release/ @@ -165,21 +136,5 @@ jobs: run: | set -e ssh -o StrictHostKeyChecking=no ubuntu@${{ vars.DOCS_SERVER_IP }} 'rm -rf /srv/www/docs' - echo "${{ steps.get_version.outputs.version }}" >docs/_version.txt - # echo "${{ github.ref_name }}" >docs/_version.txt + echo "${{ github.ref_name }}" >docs/_version.txt scp -o StrictHostKeyChecking=no -r docs ubuntu@${{ vars.DOCS_SERVER_IP }}:/srv/www/ - scp -o StrictHostKeyChecking=no nav.md ubuntu@${{ vars.DOCS_SERVER_IP }}:/srv/www/ - - - name: Notify - if: always() - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[END] Publish (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.event_name }} on branch ${{ forgejo.ref }}" - event_title: "released: ${{ steps.get_version.outputs.version }}" - event_author: ${{ forgejo.actor }} - event_body: "" - event_number: ${{ forgejo.event.id }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - status: "${{ steps.publish_to_s3.outcome == 'success' && 'SUCCESS' || 'FAILURE' }}" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d2dec624..79547c9a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,14 +16,14 @@ permissions: jobs: goreleaser: - runs-on: stackit-docker + runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 with: # Allow goreleaser to access older tag information. fetch-depth: 0 - - uses: actions/setup-go@v6 + - uses: https://code.forgejo.org/actions/setup-go@v6 with: go-version-file: "go.mod" cache: true diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 67c33d1b..90adebe6 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -8,14 +8,12 @@ on: jobs: renovate: name: Renovate - runs-on: stackit-docker + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v6 - - name: Self-hosted Renovate - uses: renovatebot/github-action@v46.1.5 + uses: renovatebot/github-action@v41.0.0 with: configurationFile: .github/renovate.json - # token: ${{ secrets.RENOVATE_TOKEN }} - token: ${{ env.FORGEJO_TOKEN }} + token: ${{ secrets.RENOVATE_TOKEN }} diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 32b39b56..6198123e 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -20,7 +20,7 @@ permissions: jobs: stale: name: "Stale" - runs-on: stackit-docker + runs-on: ubuntu-latest timeout-minutes: 10 steps: - name: "Mark old PRs as stale" diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml index 91619dde..b409df26 100644 --- a/.github/workflows/tf-acc-test.yaml +++ b/.github/workflows/tf-acc-test.yaml @@ -1,71 +1,20 @@ name: TF Acceptance Tests Workflow on: - pull_request: - types: [opened, synchronize, reopened] - branches: - - alpha - - main push: branches: - master workflow_dispatch: - inputs: - enable_debug: - description: "enable terraform debug logs" - type: boolean - default: false - required: true - - test_timeout_string: - description: "string that determines the timeout (default: '120m')" - type: string - default: '120m' - required: true - - test_file: - description: "string that determines the test file to run (default all tests)" - type: choice - options: - - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha - - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha - - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/sqlserverflexbeta - - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta - default: '' jobs: acc_test: name: Acceptance Tests - runs-on: stackit-docker + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v6 - - name: set start time - id: start_time - continue-on-error: true - run: | - time=$(date --rfc-3339=ns) - echo "start_time=$time" >> ${GITHUB_OUTPUT} - start=$(date +%s%N) - echo "start=$start" >> ${GITHUB_OUTPUT} - - - name: Notify - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[START] Terraform Acceptance Tests (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.event_name }} on branch ${{ forgejo.ref }}" - event_title: "started: ${{ steps.start_time.outputs.start_time }}" - event_author: ${{ forgejo.actor }} - event_body: ${{ inputs.test_file }} - event_number: ${{ forgejo.run_number }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - - - name: Run Test (workflow dispatch) - if: ${{ forgejo.event_name == 'workflow_dispatch' }} - id: manual_run - continue-on-error: true + - name: Run Test uses: ./.github/actions/acc_test with: go-version: ${{ env.GO_VERSION }} @@ -77,51 +26,4 @@ jobs: tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }} tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }} tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }} - tf_debug: ${{ inputs.enable_debug }} - test_timeout_string: ${{ inputs.test_timeout_string }} - test_file: ${{ inputs.test_file }} - - - name: Run Test (automatic) - if: ${{ forgejo.event_name != 'workflow_dispatch' }} - id: automatic_run - continue-on-error: true - uses: ./.github/actions/acc_test - with: - go-version: ${{ env.GO_VERSION }} - project_id: ${{ vars.TF_ACC_PROJECT_ID }} - region: 'eu01' - service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}" - project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }} - tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }} - tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }} - tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }} - tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }} - - - name: set end time - id: end_time - continue-on-error: true - run: | - set -e - echo "auto status: ${{ steps.automatic_run.outputs.status }}" - echo "manual status: ${{ steps.manual_run.outputs.status }}" - echo "status: ${{ forgejo.event_name == 'workflow_dispatch' && steps.manual_run.outputs.status || steps.automatic_run.outputs.status }}" - echo "end_time=$(date --rfc-3339=ns)" >> ${GITHUB_OUTPUT} - end=$(date +%s%N) - echo "end=${end}" >> ${GITHUB_OUTPUT} - start=${{ steps.start_time.outputs.start }} - diff=$((end-start)) - duration=$(printf "%s.%s" "${diff:0: -9}" "${diff: -9:3}") - echo "duration=${duration}" >> ${GITHUB_OUTPUT} - - - name: Notify - uses: ./.github/actions/notify - with: - webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }} - title: "[END] Terraform Acceptance Tests (#${{ forgejo.run_number }})" - subtitle: "${{ forgejo.event_name }} on branch ${{ forgejo.ref }} with status: ${{ forgejo.event_name == 'workflow_dispatch' && steps.manual_run.outputs.status || steps.automatic_run.outputs.status }}" - event_title: "run ended: ${{ steps.end_time.outputs.end_time }}, duration: ${{ steps.end_time.outputs.duration }} seconds" - event_author: ${{ forgejo.actor }} - event_body: "${{ forgejo.event_name == 'workflow_dispatch' && steps.manual_run.outputs.result || steps.automatic_run.outputs.result }}" - event_number: ${{ forgejo.event.id }} - event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}" - status: "${{ forgejo.event_name == 'workflow_dispatch' && steps.manual_run.outputs.status || steps.automatic_run.outputs.status }}" + # service_account_json_file_path: "~/service_account.json" diff --git a/.golang-ci.yaml b/.golang-ci.yaml index 8f4c571b..a9fa6be5 100644 --- a/.golang-ci.yaml +++ b/.golang-ci.yaml @@ -29,8 +29,12 @@ linters: depguard: rules: main: - list-mode: original - allow: [] + list-mode: lax + allow: + - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview + - github.com/hashicorp/terraform-plugin-framework + - github.com/hashicorp/terraform-plugin-log + - github.com/stackitcloud/stackit-sdk-go deny: - pkg: github.com/stretchr/testify desc: Do not use a testing framework @@ -72,7 +76,6 @@ linters: exclusions: paths: - generator/ - - internal/testutils generated: lax warn-unused: true # Excluding configuration per-path, per-linter, per-text and per-source. @@ -83,7 +86,7 @@ linters: - gochecknoinits formatters: enable: - - gofmt + #- gofmt - goimports settings: goimports: diff --git a/README.md b/README.md index b90466b9..ab79f28e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ terraform { required_providers { stackitprivatepreview = { source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = ">= 0.1.0" + version = "= 0.0.5-alpha" } } } @@ -38,6 +38,7 @@ Check one of the examples in the [examples](examples/) folder. To authenticate, you will need a [service account](https://docs.stackit.cloud/platform/access-and-identity/service-accounts/). Create it in the [STACKIT Portal](https://portal.stackit.cloud/) and assign the necessary permissions to it, e.g. `project.owner`. There are multiple ways to authenticate: - Key flow (recommended) +- Token flow (is scheduled for deprecation and will be removed on December 17, 2025.) When setting up authentication, the provider will always try to use the key flow first and search for credentials in several locations, following a specific order: @@ -51,6 +52,7 @@ When setting up authentication, the provider will always try to use the key flow ```json { + "STACKIT_SERVICE_ACCOUNT_TOKEN": "foo_token", "STACKIT_SERVICE_ACCOUNT_KEY_PATH": "path/to/sa_key.json" } ``` @@ -69,41 +71,35 @@ To configure the key flow, follow this steps: 1. Create a service account key: - - Use the [STACKIT Portal](https://portal.stackit.cloud/): go to the `Service Accounts` tab, choose a `Service Account` and go to `Service Account Keys` to create a key. For more details, see [Create a service account key](https://docs.stackit.cloud/platform/access-and-identity/service-accounts/how-tos/manage-service-account-keys/) +- Use the [STACKIT Portal](https://portal.stackit.cloud/): go to the `Service Accounts` tab, choose a `Service Account` and go to `Service Account Keys` to create a key. For more details, see [Create a service account key](https://docs.stackit.cloud/platform/access-and-identity/service-accounts/how-tos/manage-service-account-keys/) 2. Save the content of the service account key by copying it and saving it in a JSON file. The expected format of the service account key is a **JSON** with the following structure: - ```json - { - "id": "uuid", - "publicKey": "public key", - "createdAt": "2023-08-24T14:15:22Z", - "validUntil": "2023-08-24T14:15:22Z", - "keyType": "USER_MANAGED", - "keyOrigin": "USER_PROVIDED", - "keyAlgorithm": "RSA_2048", - "active": true, - "credentials": { - "kid": "string", - "iss": "my-sa@sa.stackit.cloud", - "sub": "uuid", - "aud": "string", - (optional) "privateKey": "private key when generated by the SA service" - } - } - ``` +```json +{ + "id": "uuid", + "publicKey": "public key", + "createdAt": "2023-08-24T14:15:22Z", + "validUntil": "2023-08-24T14:15:22Z", + "keyType": "USER_MANAGED", + "keyOrigin": "USER_PROVIDED", + "keyAlgorithm": "RSA_2048", + "active": true, + "credentials": { + "kid": "string", + "iss": "my-sa@sa.stackit.cloud", + "sub": "uuid", + "aud": "string", + (optional) "privateKey": "private key when generated by the SA service" + } +} +``` 3. Configure the service account key for authentication in the provider by following one of the alternatives below: - setting the fields in the provider block: `service_account_key` or `service_account_key_path` - ```hcl - provider "stackitprivatepreview" { - default_region = "eu01" - service_account_key_path = "../service_account.json" - } - ``` - setting the environment variable: `STACKIT_SERVICE_ACCOUNT_KEY_PATH` or `STACKIT_SERVICE_ACCOUNT_KEY` - ensure the set the service account key in `STACKIT_SERVICE_ACCOUNT_KEY` is correctly formatted. Use e.g. `$ export STACKIT_SERVICE_ACCOUNT_KEY=$(cat ./service-account-key.json)` @@ -115,6 +111,16 @@ To configure the key flow, follow this steps: > - setting the environment variable: `STACKIT_PRIVATE_KEY_PATH` or `STACKIT_PRIVATE_KEY` > - setting `STACKIT_PRIVATE_KEY_PATH` in the credentials file (see above) +### Token flow + +> Is scheduled for deprecation and will be removed on December 17, 2025. + +Using this flow is less secure since the token is long-lived. You can provide the token in several ways: + +1. Setting the field `service_account_token` in the provider +2. Setting the environment variable `STACKIT_SERVICE_ACCOUNT_TOKEN` +3. Setting it in the credentials file (see above) + ## Backend configuration To keep track of your terraform state, you can configure an [S3 backend](https://developer.hashicorp.com/terraform/language/settings/backends/s3) using [STACKIT Object Storage](https://docs.stackit.cloud/products/storage/object-storage). @@ -144,6 +150,62 @@ terraform { Note: AWS specific checks must be skipped as they do not work on STACKIT. For details on what those validations do, see [here](https://developer.hashicorp.com/terraform/language/settings/backends/s3#configuration). +## Opting into Beta Resources + +To use beta resources in the STACKIT Terraform provider, follow these steps: + +1. **Provider Configuration Option** + + Set the `enable_beta_resources` option in the provider configuration. This is a boolean attribute that can be either `true` or `false`. + + ```hcl + provider "stackit" { + default_region = "eu01" + enable_beta_resources = true + } + ``` + +2. **Environment Variable** + + Set the `STACKIT_TF_ENABLE_BETA_RESOURCES` environment variable to `"true"` or `"false"`. Other values will be ignored and will produce a warning. + + ```sh + export STACKIT_TF_ENABLE_BETA_RESOURCES=true + ``` + +> **Note**: The environment variable takes precedence over the provider configuration option. This means that if the `STACKIT_TF_ENABLE_BETA_RESOURCES` environment variable is set to a valid value (`"true"` or `"false"`), it will override the `enable_beta_resources` option specified in the provider configuration. + +For more details, please refer to the [beta resources configuration guide](https://registry.terraform.io/providers/stackitcloud/stackit/latest/docs/guides/opting_into_beta_resources). + +## Opting into Experiments + +Experiments are features that are even less mature and stable than Beta Resources. While there is some assumed stability in beta resources, will have to expect breaking changes while using experimental resources. Experimental Resources do not come with any support or warranty. + +To enable experiments set the experiments field in the provider definition: + +```hcl +provider "stackit" { + default_region = "eu01" + experiments = ["iam", "routing-tables", "network"] +} +``` + +### Available Experiments + +#### `iam` + +Enables IAM management features in the Terraform provider. The underlying IAM API is expected to undergo a redesign in the future, which leads to it being considered experimental. + +#### `routing-tables` + +This feature enables experimental routing table capabilities in the Terraform Provider, available only to designated SNAs at this time. + +#### `network` + +The `stackit_network` provides the fields `region` and `routing_table_id` when the experiment flag `network` is set. +The underlying API is not stable yet and could change in the future. +If you don't need these fields, don't set the experiment flag `network`, to use the stable api. + ## Acceptance Tests > [!WARNING] diff --git a/docs/data-sources/postgresflexalpha_database.md b/docs/data-sources/postgresflexalpha_database.md index 7e4c7183..95c115e3 100644 --- a/docs/data-sources/postgresflexalpha_database.md +++ b/docs/data-sources/postgresflexalpha_database.md @@ -28,9 +28,6 @@ data "stackitprivatepreview_postgresflexalpha_database" "example" { - `database_id` (Number) The ID of the database. - `instance_id` (String) The ID of the instance. - `project_id` (String) The STACKIT project ID. - -### Optional - - `region` (String) The region which should be addressed ### Read-Only diff --git a/docs/data-sources/postgresflexalpha_instance.md b/docs/data-sources/postgresflexalpha_instance.md index 0652d28b..d21a5f10 100644 --- a/docs/data-sources/postgresflexalpha_instance.md +++ b/docs/data-sources/postgresflexalpha_instance.md @@ -26,9 +26,6 @@ data "stackitprivatepreview_postgresflexalpha_instance" "example" { - `instance_id` (String) The ID of the instance. - `project_id` (String) The STACKIT project ID. - -### Optional - - `region` (String) The region which should be addressed ### Read-Only @@ -40,18 +37,11 @@ data "stackitprivatepreview_postgresflexalpha_instance" "example" { ⚠︝ **Note:** This feature is in private preview. Supplying this object is only permitted for enabled accounts. If your account does not have access, the request will be rejected. (see [below for nested schema](#nestedatt--encryption)) - `flavor_id` (String) The id of the instance flavor. -- `id` (String) internal ID - `is_deletable` (Boolean) Whether the instance can be deleted or not. -- `labels` (Map of String) Key-value pairs, 63 characters max, begin and end with an alphanumerical character, -may contain dashes (-), underscores (_), dots (.), and alphanumerics between. Key MUST be at least 1 character. -Max 64 labels -Regex for keys: ^(?=.{1,63}$)([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]$ -Regex for values: ^(?=.{0,63}$)(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])*$ -The stackit- prefix is reserved and cannot be used for Keys. - `name` (String) The name of the instance. - `network` (Attributes) The access configuration of the instance (see [below for nested schema](#nestedatt--network)) - `replicas` (Number) How many replicas the instance should have. -- `retention_days` (Number) How long backups are retained. The value can only be between 32 and 90 days. +- `retention_days` (Number) How long backups are retained. The value can only be between 32 and 365 days. - `status` (String) The current status of the instance. - `storage` (Attributes) The object containing information about the storage size and class. (see [below for nested schema](#nestedatt--storage)) - `tf_original_api_id` (String) The ID of the instance. diff --git a/docs/data-sources/postgresflexalpha_user.md b/docs/data-sources/postgresflexalpha_user.md index b5a8af2d..c3553c7b 100644 --- a/docs/data-sources/postgresflexalpha_user.md +++ b/docs/data-sources/postgresflexalpha_user.md @@ -27,12 +27,12 @@ data "stackitprivatepreview_postgresflexalpha_user" "example" { - `instance_id` (String) The ID of the instance. - `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed - `user_id` (Number) The ID of the user. ### Optional - `id` (String) Terraform's internal resource ID. It is structured as \"`project_id`,`region`,`instance_id`,`user_id`\".", -- `region` (String) The region which should be addressed ### Read-Only diff --git a/docs/data-sources/sqlserverflexalpha_database.md b/docs/data-sources/sqlserverflexalpha_database.md new file mode 100644 index 00000000..df66ffb7 --- /dev/null +++ b/docs/data-sources/sqlserverflexalpha_database.md @@ -0,0 +1,32 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "stackitprivatepreview_sqlserverflexalpha_database Data Source - stackitprivatepreview" +subcategory: "" +description: |- + +--- + +# stackitprivatepreview_sqlserverflexalpha_database (Data Source) + + + + + + +## Schema + +### Required + +- `database_name` (String) The name of the database. +- `instance_id` (String) The ID of the instance. +- `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed + +### Read-Only + +- `collation_name` (String) The collation of the database. This database collation should match the *collation_name* of one of the collations given by the **Get database collation list** endpoint. +- `compatibility_level` (Number) CompatibilityLevel of the Database. +- `id` (String) The terraform internal identifier. +- `name` (String) The name of the database. +- `owner` (String) The owner of the database. +- `tf_original_api_id` (Number) The id of the database. diff --git a/docs/data-sources/sqlserverflexalpha_instance.md b/docs/data-sources/sqlserverflexalpha_instance.md new file mode 100644 index 00000000..b05d7b8e --- /dev/null +++ b/docs/data-sources/sqlserverflexalpha_instance.md @@ -0,0 +1,77 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "stackitprivatepreview_sqlserverflexalpha_instance Data Source - stackitprivatepreview" +subcategory: "" +description: |- + +--- + +# stackitprivatepreview_sqlserverflexalpha_instance (Data Source) + + + +## Example Usage + +```terraform +data "stackitprivatepreview_sqlserverflexalpha_instance" "example" { + project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +} +``` + + +## Schema + +### Required + +- `instance_id` (String) The ID of the instance. +- `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed + +### Read-Only + +- `backup_schedule` (String) The schedule for on what time and how often the database backup will be created. The schedule is written as a cron schedule. +- `edition` (String) Edition of the MSSQL server instance +- `encryption` (Attributes) this defines which key to use for storage encryption (see [below for nested schema](#nestedatt--encryption)) +- `flavor_id` (String) The id of the instance flavor. +- `is_deletable` (Boolean) Whether the instance can be deleted or not. +- `name` (String) The name of the instance. +- `network` (Attributes) The access configuration of the instance (see [below for nested schema](#nestedatt--network)) +- `replicas` (Number) How many replicas the instance should have. +- `retention_days` (Number) The days for how long the backup files should be stored before cleaned up. 30 to 365 +- `status` (String) +- `storage` (Attributes) The object containing information about the storage size and class. (see [below for nested schema](#nestedatt--storage)) +- `tf_original_api_id` (String) The ID of the instance. +- `version` (String) The sqlserver version used for the instance. + + +### Nested Schema for `encryption` + +Read-Only: + +- `kek_key_id` (String) The key identifier +- `kek_key_ring_id` (String) The keyring identifier +- `kek_key_version` (String) The key version +- `service_account` (String) + + + +### Nested Schema for `network` + +Read-Only: + +- `access_scope` (String) The network access scope of the instance + +⚠️ **Note:** This feature is in private preview. Supplying this object is only permitted for enabled accounts. If your account does not have access, the request will be rejected. +- `acl` (List of String) List of IPV4 cidr. +- `instance_address` (String) +- `router_address` (String) + + + +### Nested Schema for `storage` + +Read-Only: + +- `class` (String) The storage class for the storage. +- `size` (Number) The storage size in Gigabytes. diff --git a/docs/data-sources/sqlserverflexalpha_user.md b/docs/data-sources/sqlserverflexalpha_user.md new file mode 100644 index 00000000..63526135 --- /dev/null +++ b/docs/data-sources/sqlserverflexalpha_user.md @@ -0,0 +1,62 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "stackitprivatepreview_sqlserverflexalpha_user Data Source - stackitprivatepreview" +subcategory: "" +description: |- + +--- + +# stackitprivatepreview_sqlserverflexalpha_user (Data Source) + + + +## Example Usage + +```terraform +data "stackitprivatepreview_sqlserverflexalpha_user" "example" { + project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + user_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +} +``` + + +## Schema + +### Required + +- `instance_id` (String) The ID of the instance. +- `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed + +### Optional + +- `page` (Number) Number of the page of items list to be returned. +- `size` (Number) Number of items to be returned on each page. +- `sort` (String) Sorting of the users to be returned on each page. + +### Read-Only + +- `pagination` (Attributes) (see [below for nested schema](#nestedatt--pagination)) +- `users` (Attributes List) List of all users inside an instance (see [below for nested schema](#nestedatt--users)) + + +### Nested Schema for `pagination` + +Read-Only: + +- `page` (Number) +- `size` (Number) +- `sort` (String) +- `total_pages` (Number) +- `total_rows` (Number) + + + +### Nested Schema for `users` + +Read-Only: + +- `status` (String) The current status of the user. +- `tf_original_api_id` (Number) The ID of the user. +- `username` (String) The name of the user. diff --git a/docs/data-sources/sqlserverflexbeta_flavor.md b/docs/data-sources/sqlserverflexbeta_flavor.md deleted file mode 100644 index 4d2a32f3..00000000 --- a/docs/data-sources/sqlserverflexbeta_flavor.md +++ /dev/null @@ -1,54 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "stackitprivatepreview_sqlserverflexbeta_flavor Data Source - stackitprivatepreview" -subcategory: "" -description: |- - ---- - -# stackitprivatepreview_sqlserverflexbeta_flavor (Data Source) - - - -## Example Usage - -```terraform -data "stackitprivatepreview_sqlserverflexbeta_flavor" "flavor" { - project_id = var.project_id - region = var.region - cpu = 4 - ram = 16 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} -``` - - -## Schema - -### Required - -- `cpu` (Number) The cpu count of the instance. -- `node_type` (String) defines the nodeType it can be either single or HA -- `project_id` (String) The project ID of the flavor. -- `ram` (Number) The memory of the instance in Gibibyte. -- `region` (String) The region of the flavor. -- `storage_class` (String) The memory of the instance in Gibibyte. - -### Read-Only - -- `description` (String) The flavor description. -- `flavor_id` (String) The id of the instance flavor. -- `id` (String) The id of the instance flavor. -- `max_gb` (Number) maximum storage which can be ordered for the flavor in Gigabyte. -- `min_gb` (Number) minimum storage which is required to order in Gigabyte. -- `storage_classes` (Attributes List) maximum storage which can be ordered for the flavor in Gigabyte. (see [below for nested schema](#nestedatt--storage_classes)) - - -### Nested Schema for `storage_classes` - -Read-Only: - -- `class` (String) -- `max_io_per_sec` (Number) -- `max_through_in_mb` (Number) diff --git a/docs/resources/postgresflexalpha_database.md b/docs/resources/postgresflexalpha_database.md index 29f43024..6c94fd62 100644 --- a/docs/resources/postgresflexalpha_database.md +++ b/docs/resources/postgresflexalpha_database.md @@ -54,4 +54,4 @@ import { ### Read-Only -- `id` (String) The id of the database. +- `id` (Number) The id of the database. diff --git a/docs/resources/postgresflexalpha_instance.md b/docs/resources/postgresflexalpha_instance.md index b82664ff..f6f10bcc 100644 --- a/docs/resources/postgresflexalpha_instance.md +++ b/docs/resources/postgresflexalpha_instance.md @@ -13,33 +13,6 @@ description: |- ## Example Usage ```terraform -# NOTE: flavor handling will change in future -# V2 compatible flavor usage (example without encryption) -resource "stackitprivatepreview_postgresflexalpha_instance" "example-instance" { - project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" - name = "example-instance" - acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] - backup_schedule = "0 0 * * *" - retention_days = 30 - flavor = { - cpu = 2 - ram = 4 - } - replicas = 1 - storage = { - performance_class = "premium-perf2-stackit" - size = 10 - } - network = { - acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] - access_scope = "PUBLIC" - } - version = 17 -} - -# future use of flavor (implemented in V3 API) -# first determine flavor and then use the flavor_id - resource "stackitprivatepreview_postgresflexalpha_instance" "example-instance" { project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" name = "example-instance" @@ -87,10 +60,11 @@ import { ### Required - `backup_schedule` (String) The schedule for when the database backup will be created. Currently, ONLY daily schedules are supported (every 24 hours). The schedule is written as a cron schedule. +- `flavor_id` (String) The id of the instance flavor. - `name` (String) The name of the instance. - `network` (Attributes) The access configuration of the instance (see [below for nested schema](#nestedatt--network)) - `replicas` (Number) How many replicas the instance should have. -- `retention_days` (Number) How long backups are retained. The value can only be between 32 and 90 days. +- `retention_days` (Number) How long backups are retained. The value can only be between 32 and 365 days. - `storage` (Attributes) The object containing information about the storage size and class. (see [below for nested schema](#nestedatt--storage)) - `version` (String) The Postgres version used for the instance. See [Versions Endpoint](/documentation/postgres-flex-service/version/v3alpha1#tag/Version) for supported version parameters. @@ -99,8 +73,6 @@ import { - `encryption` (Attributes) The configuration for instance's volume and backup storage encryption. ⚠︝ **Note:** This feature is in private preview. Supplying this object is only permitted for enabled accounts. If your account does not have access, the request will be rejected. (see [below for nested schema](#nestedatt--encryption)) -- `flavor` (Attributes, Deprecated) (see [below for nested schema](#nestedatt--flavor)) -- `flavor_id` (String) The id of the instance flavor. - `instance_id` (String) The ID of the instance. - `project_id` (String) The STACKIT project ID. - `region` (String) The region which should be addressed @@ -150,20 +122,6 @@ Required: - `service_account` (String) - -### Nested Schema for `flavor` - -Optional: - -- `cpu` (Number, Deprecated) -- `ram` (Number, Deprecated) - -Read-Only: - -- `description` (String) -- `id` (String) - - ### Nested Schema for `connection_info` diff --git a/docs/resources/postgresflexalpha_user.md b/docs/resources/postgresflexalpha_user.md index eebab22d..b83de15d 100644 --- a/docs/resources/postgresflexalpha_user.md +++ b/docs/resources/postgresflexalpha_user.md @@ -54,6 +54,6 @@ import { ### Read-Only -- `id` (String) The ID of the user. +- `id` (Number) The ID of the user. - `password` (String) The password for the user. - `status` (String) The current status of the user. diff --git a/docs/resources/sqlserverflexalpha_database.md b/docs/resources/sqlserverflexalpha_database.md new file mode 100644 index 00000000..7d8f050b --- /dev/null +++ b/docs/resources/sqlserverflexalpha_database.md @@ -0,0 +1,63 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "stackitprivatepreview_sqlserverflexalpha_database Resource - stackitprivatepreview" +subcategory: "" +description: |- + +--- + +# stackitprivatepreview_sqlserverflexalpha_database (Resource) + + + +## Example Usage + +```terraform +resource "stackitprivatepreview_sqlserverflexalpha_database" "example" { + project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + collation = "" + compatibility = "160" + name = "" + owner = "" +} + +# Only use the import statement, if you want to import a existing sqlserverflex database +import { + to = stackitprivatepreview_sqlserverflexalpha_database.import-example + id = "${var.project_id},${var.region},${var.sql_instance_id},${var.sql_user_id}" +} + +import { + to = stackitprivatepreview_sqlserverflexalpha_database.import-example + identity = { + project_id = "project.id" + region = "region" + instance_id = "instance.id" + database_id = "database.id" + } +} +``` + + +## Schema + +### Required + +- `name` (String) The name of the database. +- `owner` (String) The owner of the database. + +### Optional + +- `collation` (String) The collation of the database. This database collation should match the *collation_name* of one of the collations given by the **Get database collation list** endpoint. +- `compatibility` (Number) CompatibilityLevel of the Database. +- `database_name` (String) The name of the database. +- `instance_id` (String) The ID of the instance. +- `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed + +### Read-Only + +- `collation_name` (String) The collation of the database. This database collation should match the *collation_name* of one of the collations given by the **Get database collation list** endpoint. +- `compatibility_level` (Number) CompatibilityLevel of the Database. +- `id` (Number) The id of the database. diff --git a/docs/resources/sqlserverflexalpha_instance.md b/docs/resources/sqlserverflexalpha_instance.md new file mode 100644 index 00000000..95e33673 --- /dev/null +++ b/docs/resources/sqlserverflexalpha_instance.md @@ -0,0 +1,103 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "stackitprivatepreview_sqlserverflexalpha_instance Resource - stackitprivatepreview" +subcategory: "" +description: |- + +--- + +# stackitprivatepreview_sqlserverflexalpha_instance (Resource) + + + +## Example Usage + +```terraform +resource "stackitprivatepreview_sqlserverflexalpha_instance" "example" { + project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + name = "example-instance" + acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] + backup_schedule = "00 00 * * *" + flavor = { + cpu = 4 + ram = 16 + } + storage = { + class = "class" + size = 5 + } + version = 2022 +} + +# Only use the import statement, if you want to import an existing sqlserverflex instance +import { + to = stackitprivatepreview_sqlserverflexalpha_instance.import-example + id = "${var.project_id},${var.region},${var.sql_instance_id}" +} +``` + + +## Schema + +### Required + +- `backup_schedule` (String) The schedule for on what time and how often the database backup will be created. The schedule is written as a cron schedule. +- `flavor_id` (String) The id of the instance flavor. +- `name` (String) The name of the instance. +- `network` (Attributes) the network configuration of the instance. (see [below for nested schema](#nestedatt--network)) +- `retention_days` (Number) The days for how long the backup files should be stored before cleaned up. 30 to 365 +- `storage` (Attributes) The object containing information about the storage size and class. (see [below for nested schema](#nestedatt--storage)) +- `version` (String) The sqlserver version used for the instance. + +### Optional + +- `encryption` (Attributes) this defines which key to use for storage encryption (see [below for nested schema](#nestedatt--encryption)) +- `instance_id` (String) The ID of the instance. +- `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed + +### Read-Only + +- `edition` (String) Edition of the MSSQL server instance +- `id` (String) The ID of the instance. +- `is_deletable` (Boolean) Whether the instance can be deleted or not. +- `replicas` (Number) How many replicas the instance should have. +- `status` (String) + + +### Nested Schema for `network` + +Required: + +- `acl` (List of String) List of IPV4 cidr. + +Optional: + +- `access_scope` (String) The network access scope of the instance + +⚠️ **Note:** This feature is in private preview. Supplying this object is only permitted for enabled accounts. If your account does not have access, the request will be rejected. + +Read-Only: + +- `instance_address` (String) +- `router_address` (String) + + + +### Nested Schema for `storage` + +Required: + +- `class` (String) The storage class for the storage. +- `size` (Number) The storage size in Gigabytes. + + + +### Nested Schema for `encryption` + +Required: + +- `kek_key_id` (String) The key identifier +- `kek_key_ring_id` (String) The keyring identifier +- `kek_key_version` (String) The key version +- `service_account` (String) diff --git a/docs/resources/sqlserverflexalpha_user.md b/docs/resources/sqlserverflexalpha_user.md new file mode 100644 index 00000000..85d5350e --- /dev/null +++ b/docs/resources/sqlserverflexalpha_user.md @@ -0,0 +1,53 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "stackitprivatepreview_sqlserverflexalpha_user Resource - stackitprivatepreview" +subcategory: "" +description: |- + +--- + +# stackitprivatepreview_sqlserverflexalpha_user (Resource) + + + +## Example Usage + +```terraform +resource "stackitprivatepreview_sqlserverflexalpha_user" "example" { + project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + username = "username" + roles = ["role"] +} + +# Only use the import statement, if you want to import an existing sqlserverflex user +import { + to = stackitprivatepreview_sqlserverflexalpha_user.import-example + id = "${var.project_id},${var.region},${var.sql_instance_id},${var.sql_user_id}" +} +``` + + +## Schema + +### Required + +- `roles` (List of String) A list containing the user roles for the instance. A list with the valid user roles can be retrieved using the List Roles endpoint. +- `username` (String) The name of the user. + +### Optional + +- `default_database` (String) The default database for a user of the instance. +- `instance_id` (String) The ID of the instance. +- `project_id` (String) The STACKIT project ID. +- `region` (String) The region which should be addressed +- `user_id` (Number) The ID of the user. + +### Read-Only + +- `host` (String) The host of the instance in which the user belongs to. +- `id` (Number) The ID of the user. +- `password` (String) The password for the user. +- `port` (Number) The port of the instance in which the user belongs to. +- `status` (String) The current status of the user. +- `uri` (String) The connection string for the user to the instance. diff --git a/docs/resources/sqlserverflexbeta_instance.md b/docs/resources/sqlserverflexbeta_instance.md index a46e76ba..20f5a9bc 100644 --- a/docs/resources/sqlserverflexbeta_instance.md +++ b/docs/resources/sqlserverflexbeta_instance.md @@ -13,31 +13,6 @@ description: |- ## Example Usage ```terraform -# NOTE: flavor handling will change in future -# V2 compatible flavor usage -resource "stackitprivatepreview_sqlserverflexbeta_instance" "instance" { - project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" - name = "example-instance" - backup_schedule = "0 3 * * *" - retention_days = 31 - flavor = { - cpu = 2 - ram = 4 - } - storage = { - class = "premium-perf2-stackit" - size = 50 - } - version = 2022 - network = { - acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] - access_scope = "SNA" - } -} - -# future use of flavor (implemented in V3 API) -# first determine flavor and then use the flavor_id - # without encryption and SNA resource "stackitprivatepreview_sqlserverflexbeta_instance" "instance" { project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" @@ -122,6 +97,7 @@ import { ### Required - `backup_schedule` (String) The schedule for on what time and how often the database backup will be created. The schedule is written as a cron schedule. +- `flavor_id` (String) The id of the instance flavor. - `name` (String) The name of the instance. - `network` (Attributes) the network configuration of the instance. (see [below for nested schema](#nestedatt--network)) - `retention_days` (Number) The days for how long the backup files should be stored before cleaned up. 30 to 365 @@ -131,8 +107,6 @@ import { ### Optional - `encryption` (Attributes) this defines which key to use for storage encryption (see [below for nested schema](#nestedatt--encryption)) -- `flavor` (Attributes, Deprecated) (see [below for nested schema](#nestedatt--flavor)) -- `flavor_id` (String) The id of the instance flavor. - `instance_id` (String) The ID of the instance. - `project_id` (String) The STACKIT project ID. - `region` (String) The region which should be addressed @@ -182,17 +156,3 @@ Required: - `kek_key_ring_id` (String) The keyring identifier - `kek_key_version` (String) The key version - `service_account` (String) - - - -### Nested Schema for `flavor` - -Optional: - -- `cpu` (Number, Deprecated) -- `ram` (Number, Deprecated) - -Read-Only: - -- `description` (String) -- `id` (String) diff --git a/examples/resources/stackitprivatepreview_postgresflexalpha_instance/resource.tf b/examples/resources/stackitprivatepreview_postgresflexalpha_instance/resource.tf index 7250b66b..b503f0ce 100644 --- a/examples/resources/stackitprivatepreview_postgresflexalpha_instance/resource.tf +++ b/examples/resources/stackitprivatepreview_postgresflexalpha_instance/resource.tf @@ -1,30 +1,3 @@ -# NOTE: flavor handling will change in future -# V2 compatible flavor usage (example without encryption) -resource "stackitprivatepreview_postgresflexalpha_instance" "example-instance" { - project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" - name = "example-instance" - acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] - backup_schedule = "0 0 * * *" - retention_days = 30 - flavor = { - cpu = 2 - ram = 4 - } - replicas = 1 - storage = { - performance_class = "premium-perf2-stackit" - size = 10 - } - network = { - acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] - access_scope = "PUBLIC" - } - version = 17 -} - -# future use of flavor (implemented in V3 API) -# first determine flavor and then use the flavor_id - resource "stackitprivatepreview_postgresflexalpha_instance" "example-instance" { project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" name = "example-instance" diff --git a/examples/resources/stackitprivatepreview_sqlserverflexbeta_instance/resource.tf b/examples/resources/stackitprivatepreview_sqlserverflexbeta_instance/resource.tf index 565ae019..06e88f64 100644 --- a/examples/resources/stackitprivatepreview_sqlserverflexbeta_instance/resource.tf +++ b/examples/resources/stackitprivatepreview_sqlserverflexbeta_instance/resource.tf @@ -1,28 +1,3 @@ -# NOTE: flavor handling will change in future -# V2 compatible flavor usage -resource "stackitprivatepreview_sqlserverflexbeta_instance" "instance" { - project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" - name = "example-instance" - backup_schedule = "0 3 * * *" - retention_days = 31 - flavor = { - cpu = 2 - ram = 4 - } - storage = { - class = "premium-perf2-stackit" - size = 50 - } - version = 2022 - network = { - acl = ["XXX.XXX.XXX.X/XX", "XX.XXX.XX.X/XX"] - access_scope = "SNA" - } -} - -# future use of flavor (implemented in V3 API) -# first determine flavor and then use the flavor_id - # without encryption and SNA resource "stackitprivatepreview_sqlserverflexbeta_instance" "instance" { project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" diff --git a/generator/cmd/build/build.go b/generator/cmd/build/build.go index 38f07daa..f8585bad 100644 --- a/generator/cmd/build/build.go +++ b/generator/cmd/build/build.go @@ -8,11 +8,10 @@ import ( "go/token" "log/slog" "os" + "os/exec" "path" "regexp" "strings" - - "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/generator/cmd/tools" ) type Builder struct { @@ -277,14 +276,20 @@ func handleLine(line string) (string, error) { } func (b *Builder) determineRoot() error { - root, err := tools.GetGitRoot() + cmd := exec.Command("git", "rev-parse", "--show-toplevel") + out, err := cmd.Output() if err != nil { return err } - b.rootDir = root + lines := strings.Split(string(out), "\n") + if lines[0] == "" { + return fmt.Errorf("unable to determine root directory from git") + } + b.rootDir = lines[0] if b.Verbose { slog.Info(" ... using root", "dir", b.rootDir) } + return nil } diff --git a/generator/cmd/docCmd.go b/generator/cmd/docCmd.go deleted file mode 100644 index cf36610b..00000000 --- a/generator/cmd/docCmd.go +++ /dev/null @@ -1,247 +0,0 @@ -package cmd - -import ( - "fmt" - "log/slog" - "os" - "path" - "regexp" - "sort" - "strings" - "text/template" - - "github.com/spf13/cobra" - "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/generator/cmd/tools" -) - -var outFile string - -var docsCmd = &cobra.Command{ - Use: "docs", - Short: "handle documentation", - Long: `...`, - RunE: func(_ *cobra.Command, _ []string) error { - // filePathStr := "stackit/internal/services/postgresflexalpha/database/datasources_gen/database_data_source_gen.go" - // - // src, err := os.ReadFile(filePathStr) - // if err != nil { - // return err - //} - // - // i := interp.New( - // interp.Options{ - // GoPath: "/home/henselinm/.asdf/installs/golang/1.25.6/packages", - // BuildTags: nil, - // Stdin: nil, - // Stdout: nil, - // Stderr: nil, - // Args: nil, - // Env: nil, - // SourcecodeFilesystem: nil, - // Unrestricted: false, - // }, - //) - // err = i.Use(i.Symbols("github.com/hashicorp/terraform-plugin-framework-validators")) - // if err != nil { - // return err - //} - // err = i.Use(stdlib.Symbols) - // if err != nil { - // return err - //} - // _, err = i.Eval(string(src)) - // if err != nil { - // return err - //} - // - // v, err := i.Eval("DatabaseDataSourceSchema") - // if err != nil { - // return err - //} - // - // bar := v.Interface().(func(string) string) - // - // r := bar("Kung") - // println(r) - // - // evalPath, err := i.EvalPath(filePathStr) - // if err != nil { - // return err - //} - // - // fmt.Printf("%+v\n", evalPath) - - // _, err = i.Eval(`import "fmt"`) - // if err != nil { - // return err - //} - // _, err = i.Eval(`func Hallo() { fmt.Println("Hi!") }`) - // if err != nil { - // return err - //} - - // v = i.Symbols("Hallo") - - // fmt.Println(v) - return workDocs() - }, -} - -type NavDocs struct { - PageTitle string - Description string - NavigationTitle string - ProviderTitle string - IndexFound bool - Services []Service -} - -type Service struct { - ServiceTitle string - DataSources []ResItem - Resources []ResItem -} - -type ResItem struct { - ItemName string - ItemLink string -} - -func workDocs() error { - slog.Info("creating docs navigation") - root, err := tools.GetGitRoot() - if err != nil { - slog.Error("ERROR", "err", err) - return err - } - - nav := NavDocs{ - PageTitle: "STACKIT terraform provider PRIVATE-PREVIEW", - Description: "", - NavigationTitle: "Navigation", - ProviderTitle: "Provider", - IndexFound: false, - } - startPath := path.Join(root, "docs") - - docs, err := os.ReadDir(startPath) - if err != nil { - return err - } - - services := make(map[string]Service) - dataSources := make(map[string][]ResItem) - resources := make(map[string][]ResItem) - - for _, entry := range docs { - if !entry.IsDir() { - if entry.Name() == "index.md" { - slog.Debug(" found provider index file") - nav.IndexFound = true - continue - } - slog.Debug(" found am ignored file", "fileName", entry.Name()) - continue - } - - if entry.Name() != "data-sources" && entry.Name() != "resources" { - slog.Error("unable to handle entry, skipping", "entry", entry.Name()) - continue - } - - elements, err := os.ReadDir(path.Join(startPath, entry.Name())) - if err != nil { - return err - } - for _, res := range elements { - if res.IsDir() { - slog.Warn("found unexpected directory", "dir", res.Name()) - continue - } - - re := regexp.MustCompile(`([a-z]+)_([a-z]+).md`) - matches := re.FindAllStringSubmatch(res.Name(), -1) - if matches == nil { - slog.Error("unable to identify resource", "item", res.Name()) - continue - } - services[matches[0][1]] = Service{ - ServiceTitle: matches[0][1], - } - switch entry.Name() { - case "data-sources": - dataSources[matches[0][1]] = append(dataSources[matches[0][1]], ResItem{ - ItemName: matches[0][2], - ItemLink: fmt.Sprintf("/docs/docs/%s/%s", entry.Name(), matches[0][0]), - }) - case "resources": - resources[matches[0][1]] = append(resources[matches[0][1]], ResItem{ - ItemName: matches[0][2], - ItemLink: fmt.Sprintf("/docs/docs/%s/%s", entry.Name(), matches[0][0]), - }) - default: - return fmt.Errorf("this should never have happened") - } - } - - } - - keys := make([]string, 0, len(services)) - for k := range services { - keys = append(keys, k) - } - sort.Strings(keys) - - for _, name := range keys { - item := services[name] - item.DataSources = dataSources[name] - item.Resources = resources[name] - nav.Services = append(nav.Services, item) - } - - fn := template.FuncMap{ - "ucfirst": ucfirst, - } - - tmpl, err := template. - New("nav.md.gompl"). - Funcs(fn). - ParseFiles(path.Join(root, "generator", "cmd", "docs", "templates", "nav.md.gompl")) - if err != nil { - return err - } - - var f *os.File - f, err = os.Create(outFile) - if err != nil { - return err - } - - err = tmpl.Execute(f, nav) - if err != nil { - return err - } - - err = f.Close() - if err != nil { - return err - } - - slog.Info("finished") - return nil -} - -func NewDocsCmd() *cobra.Command { - return docsCmd -} - -func ucfirst(s string) string { - if s == "" { - return "" - } - return strings.ToUpper(s[:1]) + s[1:] -} - -func init() { // nolint: gochecknoinits - docsCmd.Flags().StringVarP(&outFile, "outFile", "o", "nav.md", "nav.md") -} diff --git a/generator/cmd/docs/templates/nav.md.gompl b/generator/cmd/docs/templates/nav.md.gompl deleted file mode 100644 index 3800b171..00000000 --- a/generator/cmd/docs/templates/nav.md.gompl +++ /dev/null @@ -1,27 +0,0 @@ ---- -page_title: {{ .PageTitle }} -description: {{ .Description }} ---- -## {{ .NavigationTitle }} -### {{ .ProviderTitle }} -{{ if .IndexFound }} -[Provider](/docs/docs/index.md) -{{ end }} -{{- range $index, $service := .Services }} -### {{ $service.ServiceTitle }} -
- -#### data sources - -{{- range $service.DataSources }} -- [{{ .ItemName }}]({{ .ItemLink }}) -{{- end }} - -#### resources - -{{- range $service.Resources }} -- [{{ .ItemName }}]({{ .ItemLink }}) -{{- end }} -
- -{{ end }} diff --git a/generator/cmd/rootCmd.go b/generator/cmd/rootCmd.go index 8f764b57..924d8794 100644 --- a/generator/cmd/rootCmd.go +++ b/generator/cmd/rootCmd.go @@ -6,7 +6,7 @@ import ( func NewRootCmd() *cobra.Command { return &cobra.Command{ - Use: "generator", + Use: "build-tools", Short: "...", Long: "...", SilenceErrors: true, // Error is beautified in a custom way before being printed diff --git a/generator/cmd/tools/tools.go b/generator/cmd/tools/tools.go deleted file mode 100644 index 334e95ee..00000000 --- a/generator/cmd/tools/tools.go +++ /dev/null @@ -1,20 +0,0 @@ -package tools - -import ( - "fmt" - "os/exec" - "strings" -) - -func GetGitRoot() (string, error) { - cmd := exec.Command("git", "rev-parse", "--show-toplevel") - out, err := cmd.Output() - if err != nil { - return "", err - } - lines := strings.Split(string(out), "\n") - if lines[0] == "" { - return "", fmt.Errorf("unable to determine root directory from git") - } - return lines[0], nil -} diff --git a/generator/main.go b/generator/main.go index 464e57a0..44e11c23 100644 --- a/generator/main.go +++ b/generator/main.go @@ -31,7 +31,6 @@ func main() { cmd.NewPublishCmd(), cmd.NewGetFieldsCmd(), cmd.NewExamplesCmd(), - cmd.NewDocsCmd(), ) err := rootCmd.Execute() diff --git a/go.mod b/go.mod index 9954c594..4a7ad690 100644 --- a/go.mod +++ b/go.mod @@ -1,25 +1,26 @@ module tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview -go 1.26.2 +go 1.25.6 require ( - github.com/SladkyCitron/slogcolor v1.9.0 + github.com/SladkyCitron/slogcolor v1.8.0 + github.com/golang-jwt/jwt/v5 v5.3.1 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/hashicorp/terraform-plugin-framework v1.19.0 + github.com/hashicorp/terraform-plugin-framework v1.18.0 github.com/hashicorp/terraform-plugin-framework-validators v0.19.0 - github.com/hashicorp/terraform-plugin-go v0.31.0 + github.com/hashicorp/terraform-plugin-go v0.30.0 github.com/hashicorp/terraform-plugin-log v0.10.0 - github.com/hashicorp/terraform-plugin-testing v1.16.0 + github.com/hashicorp/terraform-plugin-testing v1.14.0 github.com/iancoleman/strcase v0.3.0 github.com/ivanpirog/coloredcobra v1.0.1 github.com/jarcoal/httpmock v1.4.1 github.com/joho/godotenv v1.5.1 github.com/ldez/go-git-cmd-wrapper/v2 v2.9.1 github.com/spf13/cobra v1.10.2 - github.com/stackitcloud/stackit-sdk-go/core v0.26.0 - github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.8.0 - github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.10.0 + github.com/stackitcloud/stackit-sdk-go/core v0.22.0 + github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.4.0 + github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.5.0 github.com/teambition/rrule-go v1.8.2 gopkg.in/yaml.v3 v3.0.1 ) @@ -27,77 +28,261 @@ require ( require github.com/hashicorp/go-retryablehttp v0.7.8 // indirect require ( + 4d63.com/gocheckcompilerdirectives v1.3.0 // indirect + 4d63.com/gochecknoglobals v0.2.2 // indirect + codeberg.org/chavacava/garif v0.2.0 // indirect + codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect dario.cat/mergo v1.0.1 // indirect - github.com/BurntSushi/toml v1.2.1 // indirect + dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect + dev.gaijin.team/go/golib v0.6.0 // indirect + github.com/4meepo/tagalign v1.4.3 // indirect + github.com/Abirdcfly/dupword v0.1.7 // indirect + github.com/AdminBenni/iota-mixing v1.0.0 // indirect + github.com/AlwxSin/noinlineerr v1.0.5 // indirect + github.com/Antonboom/errname v1.1.1 // indirect + github.com/Antonboom/nilnil v1.1.1 // indirect + github.com/Antonboom/testifylint v1.6.4 // indirect + github.com/BurntSushi/toml v1.6.0 // indirect + github.com/Djarvur/go-err113 v0.1.1 // indirect github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.0 // indirect + github.com/Masterminds/semver/v3 v3.4.0 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect - github.com/ProtonMail/go-crypto v1.4.1 // indirect + github.com/MirrexOne/unqueryvet v1.5.4 // indirect + github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect + github.com/ProtonMail/go-crypto v1.4.0 // indirect github.com/agext/levenshtein v1.2.3 // indirect + github.com/alecthomas/chroma/v2 v2.23.1 // indirect + github.com/alecthomas/go-check-sumtype v0.3.1 // indirect + github.com/alexkohler/nakedret/v2 v2.0.6 // indirect + github.com/alexkohler/prealloc v1.1.0 // indirect + github.com/alfatraining/structtag v1.0.0 // indirect + github.com/alingse/asasalint v0.0.11 // indirect + github.com/alingse/nilnesserr v0.2.0 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/armon/go-radix v1.0.0 // indirect + github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect + github.com/ashanbrown/makezero/v2 v2.1.0 // 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/bmatcuk/doublestar/v4 v4.10.0 // indirect + github.com/bkielbasa/cyclop v1.2.3 // indirect + github.com/blizzy78/varnamelen v0.8.0 // indirect + github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect + github.com/bombsimon/wsl/v4 v4.7.0 // indirect + github.com/bombsimon/wsl/v5 v5.6.0 // indirect + github.com/breml/bidichk v0.3.3 // indirect + github.com/breml/errchkjson v0.4.1 // indirect + github.com/butuzov/ireturn v0.4.0 // indirect + github.com/butuzov/mirror v1.3.0 // indirect + github.com/catenacyber/perfsprint v0.10.1 // indirect + github.com/ccojocar/zxcvbn-go v1.0.4 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/charithe/durationcheck v0.0.11 // indirect + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect + github.com/charmbracelet/lipgloss v1.1.0 // indirect + github.com/charmbracelet/x/ansi v0.10.1 // indirect + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect + github.com/charmbracelet/x/term v0.2.1 // indirect + github.com/ckaznocha/intrange v0.3.1 // indirect github.com/cloudflare/circl v1.6.3 // indirect - github.com/fatih/color v1.19.0 // indirect - github.com/golang-jwt/jwt/v5 v5.3.1 // indirect + github.com/curioswitch/go-reassign v0.3.0 // indirect + github.com/daixiang0/gci v0.13.7 // indirect + github.com/dave/dst v0.27.3 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/denis-tingaikin/go-header v0.5.0 // indirect + github.com/dlclark/regexp2 v1.11.5 // indirect + github.com/ettle/strcase v0.2.0 // indirect + github.com/fatih/color v1.18.0 // indirect + github.com/fatih/structtag v1.2.0 // indirect + github.com/firefart/nonamedreturns v1.0.6 // indirect + github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/fzipp/gocyclo v0.6.0 // indirect + github.com/ghostiam/protogetter v0.3.20 // indirect + github.com/go-critic/go-critic v0.14.3 // 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.2.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-viper/mapstructure/v2 v2.5.0 // indirect + github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/godoc-lint/godoc-lint v0.11.2 // indirect + github.com/gofrs/flock v0.13.0 // indirect github.com/golang/protobuf v1.5.4 // indirect + github.com/golangci/asciicheck v0.5.0 // indirect + github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect + github.com/golangci/go-printf-func-name v0.1.1 // indirect + github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect + github.com/golangci/golangci-lint/v2 v2.11.2 // indirect + github.com/golangci/golines v0.15.0 // indirect + github.com/golangci/misspell v0.8.0 // indirect + github.com/golangci/plugin-module-register v0.1.2 // indirect + github.com/golangci/revgrep v0.8.0 // indirect + github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect + github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect + github.com/gordonklaus/ineffassign v0.2.0 // indirect + github.com/gostaticanalysis/analysisutil v0.7.1 // indirect + github.com/gostaticanalysis/comment v1.5.0 // indirect + github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect + github.com/gostaticanalysis/nilerr v0.1.2 // indirect github.com/hashicorp/cli v1.1.7 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-cty v1.5.0 // indirect github.com/hashicorp/go-hclog v1.6.3 // indirect + github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-plugin v1.8.0 // indirect + github.com/hashicorp/go-plugin v1.7.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/hashicorp/go-version v1.9.0 // indirect - github.com/hashicorp/hc-install v0.9.5 // indirect + github.com/hashicorp/go-version v1.8.0 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect + github.com/hashicorp/hc-install v0.9.3 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.24.0 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.25.2 // indirect - github.com/hashicorp/terraform-json v0.27.3-0.20260213134036-298b8f6b673a // indirect - github.com/hashicorp/terraform-plugin-docs v0.25.0 // indirect - github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1 // indirect + github.com/hashicorp/terraform-exec v0.25.0 // indirect + github.com/hashicorp/terraform-json v0.27.2 // indirect + github.com/hashicorp/terraform-plugin-docs v0.24.0 // indirect + github.com/hashicorp/terraform-plugin-sdk/v2 v2.39.0 // indirect github.com/hashicorp/terraform-registry-address v0.4.0 // indirect github.com/hashicorp/terraform-svchost v0.2.1 // indirect github.com/hashicorp/yamux v0.1.2 // indirect + github.com/hexops/gotextdiff v1.0.3 // indirect github.com/huandu/xstrings v1.3.3 // indirect github.com/imdario/mergo v0.3.15 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jgautheron/goconst v1.8.2 // indirect + github.com/jingyugao/rowserrcheck v1.1.1 // indirect + github.com/jjti/go-spancheck v0.6.5 // indirect + github.com/julz/importas v0.2.0 // indirect + github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect + github.com/kisielk/errcheck v1.10.0 // indirect + github.com/kkHAIKE/contextcheck v1.1.6 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/kulti/thelper v0.7.1 // indirect + github.com/kunwardeep/paralleltest v1.0.15 // indirect + github.com/lasiar/canonicalheader v1.1.2 // indirect + github.com/ldez/exptostd v0.4.5 // indirect + github.com/ldez/gomoddirectives v0.8.0 // indirect + github.com/ldez/grignotin v0.10.1 // indirect + github.com/ldez/structtags v0.6.1 // indirect + github.com/ldez/tagliatelle v0.7.2 // indirect + github.com/ldez/usetesting v0.5.0 // indirect + github.com/leonklingele/grouper v1.1.2 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/macabu/inamedparam v0.2.0 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect + github.com/manuelarte/funcorder v0.5.0 // indirect + github.com/maratori/testableexamples v1.0.1 // indirect + github.com/maratori/testpackage v1.1.2 // indirect + github.com/matoous/godox v1.1.0 // indirect github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.22 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mgechev/revive v1.15.0 // 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.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moricho/tparallel v0.3.2 // indirect + github.com/muesli/termenv v0.16.0 // indirect + github.com/nakabonne/nestif v0.3.1 // indirect + github.com/nishanths/exhaustive v0.12.0 // indirect + github.com/nishanths/predeclared v0.2.2 // indirect + github.com/nunnatsa/ginkgolinter v0.23.0 // indirect github.com/oklog/run v1.2.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/posener/complete v1.2.3 // indirect + github.com/prometheus/client_golang v1.12.1 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/quasilyte/go-ruleguard v0.4.5 // indirect + github.com/quasilyte/go-ruleguard/dsl v0.3.23 // 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/raeperd/recvcheck v0.2.0 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect + github.com/ryancurrah/gomodguard v1.4.1 // indirect + github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect + github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect + github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect + github.com/sashamelentyev/interfacebloat v1.1.0 // indirect + github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect + github.com/securego/gosec/v2 v2.24.7 // indirect github.com/shopspring/decimal v1.3.1 // indirect + github.com/sirupsen/logrus v1.9.4 // indirect + github.com/sivchari/containedctx v1.0.3 // indirect + github.com/sonatard/noctx v0.5.0 // indirect + github.com/sourcegraph/go-diff v0.7.0 // indirect + github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.10 // indirect + github.com/spf13/viper v1.12.0 // indirect + github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect + github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/stretchr/testify v1.11.1 // indirect + github.com/subosito/gotenv v1.4.1 // indirect + github.com/tetafro/godot v1.5.4 // indirect + github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect + github.com/timonwong/loggercheck v0.11.0 // indirect + github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect + github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect + github.com/ultraware/funlen v0.2.0 // indirect + github.com/ultraware/whitespace v0.2.0 // indirect + github.com/uudashr/gocognit v1.2.1 // indirect + github.com/uudashr/iface v1.4.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/xen0n/gosmopolitan v1.3.0 // indirect + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect + github.com/yagipy/maintidx v1.0.0 // indirect + github.com/yeya24/promlinter v0.3.0 // indirect + github.com/ykadowak/zerologlint v0.1.5 // indirect github.com/yuin/goldmark v1.7.7 // indirect github.com/yuin/goldmark-meta v1.1.0 // indirect - github.com/zclconf/go-cty v1.18.1 // indirect + github.com/zclconf/go-cty v1.18.0 // indirect + gitlab.com/bosi/decorder v0.4.2 // indirect + go-simpler.org/musttag v0.14.0 // indirect + go-simpler.org/sloglint v0.11.1 // indirect go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect - golang.org/x/crypto v0.50.0 // indirect - golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect - golang.org/x/mod v0.35.0 // indirect - golang.org/x/net v0.53.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.43.0 // indirect - golang.org/x/text v0.36.0 // indirect - golang.org/x/tools v0.44.0 // indirect + go.augendre.info/arangolint v0.4.0 // indirect + go.augendre.info/fatcontext v0.9.0 // indirect + go.uber.org/multierr v1.10.0 // indirect + go.uber.org/zap v1.27.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/crypto v0.48.0 // indirect + golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect + golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect + golang.org/x/mod v0.33.0 // indirect + golang.org/x/net v0.51.0 // indirect + golang.org/x/sync v0.19.0 // indirect + golang.org/x/sys v0.41.0 // indirect + golang.org/x/text v0.34.0 // indirect + golang.org/x/tools v0.42.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 // indirect - google.golang.org/grpc v1.81.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/grpc v1.79.2 // indirect google.golang.org/protobuf v1.36.11 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + honnef.co/go/tools v0.7.0 // indirect + mvdan.cc/gofumpt v0.9.2 // indirect + mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect ) diff --git a/go.sum b/go.sum index eb49c8e4..f0894d33 100644 --- a/go.sum +++ b/go.sum @@ -1,79 +1,371 @@ +4d63.com/gocheckcompilerdirectives v1.3.0 h1:Ew5y5CtcAAQeTVKUVFrE7EwHMrTO6BggtEj8BZSjZ3A= +4d63.com/gocheckcompilerdirectives v1.3.0/go.mod h1:ofsJ4zx2QAuIP/NO/NAh1ig6R1Fb18/GI7RVMwz7kAY= +4d63.com/gochecknoglobals v0.2.2 h1:H1vdnwnMaZdQW/N+NrkT1SZMTBmcwHe9Vq8lJcYYTtU= +4d63.com/gochecknoglobals v0.2.2/go.mod h1:lLxwTQjL5eIesRbvnzIP3jZtG140FnTdz+AlMa+ogt0= +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.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.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +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= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +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= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +codeberg.org/chavacava/garif v0.2.0 h1:F0tVjhYbuOCnvNcU3YSpO6b3Waw6Bimy4K0mM8y6MfY= +codeberg.org/chavacava/garif v0.2.0/go.mod h1:P2BPbVbT4QcvLZrORc2T29szK3xEOlnl0GiPTJmEqBQ= +codeberg.org/polyfloyd/go-errorlint v1.9.0 h1:VkdEEmA1VBpH6ecQoMR4LdphVI3fA4RrCh2an7YmodI= +codeberg.org/polyfloyd/go-errorlint v1.9.0/go.mod h1:GPRRu2LzVijNn4YkrZYJfatQIdS+TrcK8rL5Xs24qw8= dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dev.gaijin.team/go/exhaustruct/v4 v4.0.0 h1:873r7aNneqoBB3IaFIzhvt2RFYTuHgmMjoKfwODoI1Y= +dev.gaijin.team/go/exhaustruct/v4 v4.0.0/go.mod h1:aZ/k2o4Y05aMJtiux15x8iXaumE88YdiB0Ai4fXOzPI= +dev.gaijin.team/go/golib v0.6.0 h1:v6nnznFTs4bppib/NyU1PQxobwDHwCXXl15P7DV5Zgo= +dev.gaijin.team/go/golib v0.6.0/go.mod h1:uY1mShx8Z/aNHWDyAkZTkX+uCi5PdX7KsG1eDQa2AVE= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/4meepo/tagalign v1.4.3 h1:Bnu7jGWwbfpAie2vyl63Zup5KuRv21olsPIha53BJr8= +github.com/4meepo/tagalign v1.4.3/go.mod h1:00WwRjiuSbrRJnSVeGWPLp2epS5Q/l4UEy0apLLS37c= +github.com/Abirdcfly/dupword v0.1.7 h1:2j8sInznrje4I0CMisSL6ipEBkeJUJAmK1/lfoNGWrQ= +github.com/Abirdcfly/dupword v0.1.7/go.mod h1:K0DkBeOebJ4VyOICFdppB23Q0YMOgVafM0zYW0n9lF4= +github.com/AdminBenni/iota-mixing v1.0.0 h1:Os6lpjG2dp/AE5fYBPAA1zfa2qMdCAWwPMCgpwKq7wo= +github.com/AdminBenni/iota-mixing v1.0.0/go.mod h1:i4+tpAaB+qMVIV9OK3m4/DAynOd5bQFaOu+2AhtBCNY= +github.com/AlwxSin/noinlineerr v1.0.5 h1:RUjt63wk1AYWTXtVXbSqemlbVTb23JOSRiNsshj7TbY= +github.com/AlwxSin/noinlineerr v1.0.5/go.mod h1:+QgkkoYrMH7RHvcdxdlI7vYYEdgeoFOVjU9sUhw/rQc= +github.com/Antonboom/errname v1.1.1 h1:bllB7mlIbTVzO9jmSWVWLjxTEbGBVQ1Ff/ClQgtPw9Q= +github.com/Antonboom/errname v1.1.1/go.mod h1:gjhe24xoxXp0ScLtHzjiXp0Exi1RFLKJb0bVBtWKCWQ= +github.com/Antonboom/nilnil v1.1.1 h1:9Mdr6BYd8WHCDngQnNVV0b554xyisFioEKi30sksufQ= +github.com/Antonboom/nilnil v1.1.1/go.mod h1:yCyAmSw3doopbOWhJlVci+HuyNRuHJKIv6V2oYQa8II= +github.com/Antonboom/testifylint v1.6.4 h1:gs9fUEy+egzxkEbq9P4cpcMB6/G0DYdMeiFS87UiqmQ= +github.com/Antonboom/testifylint v1.6.4/go.mod h1:YO33FROXX2OoUfwjz8g+gUxQXio5i9qpVy7nXGbxDD4= +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.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= +github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Djarvur/go-err113 v0.1.1 h1:eHfopDqXRwAi+YmCUas75ZE0+hoBHJ2GQNLYRSxao4g= +github.com/Djarvur/go-err113 v0.1.1/go.mod h1:IaWJdYFLg76t2ihfflPZnM1LIQszWOsFDh2hhhAVF6k= github.com/Kunde21/markdownfmt/v3 v3.1.0 h1:KiZu9LKs+wFFBQKhrZJrFZwtLnCCWJahL+S+E/3VnM0= github.com/Kunde21/markdownfmt/v3 v3.1.0/go.mod h1:tPXN1RTyOzJwhfHoon9wUr4HGYmWgVxSQN6VBJDkrVc= 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/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= +github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM= -github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo= -github.com/SladkyCitron/slogcolor v1.9.0 h1:fr4LeG+T6pZ1RYNNOP925jaBYrTdpA6BLzGy29yd4vI= -github.com/SladkyCitron/slogcolor v1.9.0/go.mod h1:ft8LEVIl4isUkebakhv+ngNXJjWBumnwhXfxTLApf3M= +github.com/MirrexOne/unqueryvet v1.5.4 h1:38QOxShO7JmMWT+eCdDMbcUgGCOeJphVkzzRgyLJgsQ= +github.com/MirrexOne/unqueryvet v1.5.4/go.mod h1:fs9Zq6eh1LRIhsDIsxf9PONVUjYdFHdtkHIgZdJnyPU= +github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsuj3piCMx4= +github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo= +github.com/ProtonMail/go-crypto v1.4.0 h1:Zq/pbM3F5DFgJiMouxEdSVY44MVoQNEKp5d5QxIQceQ= +github.com/ProtonMail/go-crypto v1.4.0/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo= +github.com/SladkyCitron/slogcolor v1.8.0 h1:ln4mUPfVhs7a/vZfjnKkz5YZ71Bg/KFWneS2hfFq6FM= +github.com/SladkyCitron/slogcolor v1.8.0/go.mod h1:ft8LEVIl4isUkebakhv+ngNXJjWBumnwhXfxTLApf3M= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/alecthomas/chroma/v2 v2.23.1 h1:nv2AVZdTyClGbVQkIzlDm/rnhk1E9bU9nXwmZ/Vk/iY= +github.com/alecthomas/chroma/v2 v2.23.1/go.mod h1:NqVhfBR0lte5Ouh3DcthuUCTUpDC9cxBOfyMbMQPs3o= +github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsrxJb4Aq31NLkU= +github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E= +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.6 h1:ME3Qef1/KIKr3kWX3nti3hhgNxw6aqN5pZmQiFSsuzQ= +github.com/alexkohler/nakedret/v2 v2.0.6/go.mod h1:l3RKju/IzOMQHmsEvXwkqMDzHHvurNQfAgE1eVmT40Q= +github.com/alexkohler/prealloc v1.1.0 h1:cKGRBqlXw5iyQGLYhrXrDlcHxugXpTq4tQ5c91wkf8M= +github.com/alexkohler/prealloc v1.1.0/go.mod h1:fT39Jge3bQrfA7nPMDngUfvUbQGQeJyGQnR+913SCig= +github.com/alfatraining/structtag v1.0.0 h1:2qmcUqNcCoyVJ0up879K614L9PazjBSFruTB0GOFjCc= +github.com/alfatraining/structtag v1.0.0/go.mod h1:p3Xi5SwzTi+Ryj64DqjLWz7XurHxbGsq6y3ubePJPus= +github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= +github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= +github.com/alingse/nilnesserr v0.2.0 h1:raLem5KG7EFVb4UIDAXgrv3N2JIaffeKNtcEXkEWd/w= +github.com/alingse/nilnesserr v0.2.0/go.mod h1:1xJPrXonEtX7wyTq8Dytns5P2hNzoWymVUIaKm4HNFg= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= 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/ashanbrown/forbidigo/v2 v2.3.0 h1:OZZDOchCgsX5gvToVtEBoV2UWbFfI6RKQTir2UZzSxo= +github.com/ashanbrown/forbidigo/v2 v2.3.0/go.mod h1:5p6VmsG5/1xx3E785W9fouMxIOkvY2rRV9nMdWadd6c= +github.com/ashanbrown/makezero/v2 v2.1.0 h1:snuKYMbqosNokUKm+R6/+vOPs8yVAi46La7Ck6QYSaE= +github.com/ashanbrown/makezero/v2 v2.1.0/go.mod h1:aEGT/9q3S8DHeE57C88z2a6xydvgx8J5hgXIGWgo0MY= +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/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +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/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6TYWexEs= -github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5w= +github.com/bkielbasa/cyclop v1.2.3/go.mod h1:kHTwA9Q0uZqOADdupvcFJQtp/ksSnytRMe8ztxG8Fuo= +github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= +github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= +github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE= +github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bombsimon/wsl/v4 v4.7.0 h1:1Ilm9JBPRczjyUs6hvOPKvd7VL1Q++PL8M0SXBDf+jQ= +github.com/bombsimon/wsl/v4 v4.7.0/go.mod h1:uV/+6BkffuzSAVYD+yGyld1AChO7/EuLrCF/8xTiapg= +github.com/bombsimon/wsl/v5 v5.6.0 h1:4z+/sBqC5vUmSp1O0mS+czxwH9+LKXtCWtHH9rZGQL8= +github.com/bombsimon/wsl/v5 v5.6.0/go.mod h1:Uqt2EfrMj2NV8UGoN1f1Y3m0NpUVCsUdrNCdet+8LvU= +github.com/breml/bidichk v0.3.3 h1:WSM67ztRusf1sMoqH6/c4OBCUlRVTKq+CbSeo0R17sE= +github.com/breml/bidichk v0.3.3/go.mod h1:ISbsut8OnjB367j5NseXEGGgO/th206dVa427kR8YTE= +github.com/breml/errchkjson v0.4.1 h1:keFSS8D7A2T0haP9kzZTi7o26r7kE3vymjZNeNDRDwg= +github.com/breml/errchkjson v0.4.1/go.mod h1:a23OvR6Qvcl7DG/Z4o0el6BRAjKnaReoPQFciAl9U3s= github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw= github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c= +github.com/butuzov/ireturn v0.4.0 h1:+s76bF/PfeKEdbG8b54aCocxXmi0wvYdOVsWxVO7n8E= +github.com/butuzov/ireturn v0.4.0/go.mod h1:ghI0FrCmap8pDWZwfPisFD1vEc56VKH4NpQUxDHta70= +github.com/butuzov/mirror v1.3.0 h1:HdWCXzmwlQHdVhwvsfBb2Au0r3HyINry3bDWLYXiKoc= +github.com/butuzov/mirror v1.3.0/go.mod h1:AEij0Z8YMALaq4yQj9CPPVYOyJQyiexpQEQgihajRfI= +github.com/catenacyber/perfsprint v0.10.1 h1:u7Riei30bk46XsG8nknMhKLXG9BcXz3+3tl/WpKm0PQ= +github.com/catenacyber/perfsprint v0.10.1/go.mod h1:DJTGsi/Zufpuus6XPGJyKOTMELe347o6akPvWG9Zcsc= +github.com/ccojocar/zxcvbn-go v1.0.4 h1:FWnCIRMXPj43ukfX000kvBZvV6raSxakYr1nzyNrUcc= +github.com/ccojocar/zxcvbn-go v1.0.4/go.mod h1:3GxGX+rHmueTUMvm5ium7irpyjmm7ikxYFOSJB21Das= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charithe/durationcheck v0.0.11 h1:g1/EX1eIiKS57NTWsYtHDZ/APfeXKhye1DidBcABctk= +github.com/charithe/durationcheck v0.0.11/go.mod h1:x5iZaixRNl8ctbM+3B2RrPG5t856TxRyVQEnbIEM2X4= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= +github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= +github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ= +github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= +github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= +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/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs= +github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/curioswitch/go-reassign v0.3.0 h1:dh3kpQHuADL3cobV/sSGETA8DOv457dwl+fbBAhrQPs= +github.com/curioswitch/go-reassign v0.3.0/go.mod h1:nApPCCTtqLJN/s8HfItCcKV0jIPwluBOvZP+dsJGA88= github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= +github.com/daixiang0/gci v0.13.7 h1:+0bG5eK9vlI08J+J/NWGbWPTNiXPG4WhNLJOkSxWITQ= +github.com/daixiang0/gci v0.13.7/go.mod h1:812WVN6JLFY9S6Tv76twqmNqevN0pa3SX3nih0brVzQ= +github.com/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY= +github.com/dave/dst v0.27.3/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8= +github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY= +github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= +github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +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= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q= +github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w= -github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +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/firefart/nonamedreturns v1.0.6 h1:vmiBcKV/3EqKY3ZiPxCINmpS431OcE1S47AQUwhrg8E= +github.com/firefart/nonamedreturns v1.0.6/go.mod h1:R8NisJnSIpvPWheCq0mNRXJok6D8h7fagJTF8EMEwCo= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= +github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= +github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1f+MzD0= +github.com/ghostiam/protogetter v0.3.20/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI= +github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog= +github.com/go-critic/go-critic v0.14.3/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= -github.com/go-git/go-billy/v5 v5.8.0 h1:I8hjc3LbBlXTtVuFNJuwYuMiHvQJDq1AT6u4DwDzZG0= -github.com/go-git/go-billy/v5 v5.8.0/go.mod h1:RpvI/rw4Vr5QA+Z60c6d6LXH0rYJo0uD5SqfmrrheCY= -github.com/go-git/go-git/v5 v5.18.0 h1:O831KI+0PR51hM2kep6T8k+w0/LIAD490gvqMCvL5hM= -github.com/go-git/go-git/v5 v5.18.0/go.mod h1:pW/VmeqkanRFqR6AljLcs7EA7FbZaN5MQqO7oZADXpo= +github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM= +github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= +github.com/go-git/go-git/v5 v5.16.5 h1:mdkuqblwr57kVfXri5TTH+nMFLNUxIj9Z7F5ykFbw5s= +github.com/go-git/go-git/v5 v5.16.5/go.mod h1:QOMLpNf1qxuSY4StA/ArOdfFR2TrKEjJiye2kel2m+M= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +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/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +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/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ= +github.com/go-toolsmith/astequal v1.2.0 h1:3Fs3CYZ1k9Vo4FzFhwwewC3CHISHDnVUPC4x0bI2+Cw= +github.com/go-toolsmith/astequal v1.2.0/go.mod h1:c8NZ3+kSFtFY/8lPso4v8LuJjdJiUFVnSuU3s0qrrDY= +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/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +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-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro= +github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY= +github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/godoc-lint/godoc-lint v0.11.2 h1:Bp0FkJWoSdNsBikdNgIcgtaoo+xz6I/Y9s5WSBQUeeM= +github.com/godoc-lint/godoc-lint v0.11.2/go.mod h1:iVpGdL1JCikNH2gGeAn3Hh+AgN5Gx/I/cxV+91L41jo= +github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw= +github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +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= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +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/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +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= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golangci/asciicheck v0.5.0 h1:jczN/BorERZwK8oiFBOGvlGPknhvq0bjnysTj4nUfo0= +github.com/golangci/asciicheck v0.5.0/go.mod h1:5RMNAInbNFw2krqN6ibBxN/zfRFa9S6tA1nPdM0l8qQ= +github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 h1:WUvBfQL6EW/40l6OmeSBYQJNSif4O11+bmWEz+C7FYw= +github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32/go.mod h1:NUw9Zr2Sy7+HxzdjIULge71wI6yEg1lWQr7Evcu8K0E= +github.com/golangci/go-printf-func-name v0.1.1 h1:hIYTFJqAGp1iwoIfsNTpoq1xZAarogrvjO9AfiW3B4U= +github.com/golangci/go-printf-func-name v0.1.1/go.mod h1:Es64MpWEZbh0UBtTAICOZiB+miW53w/K9Or/4QogJss= +github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE= +github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY= +github.com/golangci/golangci-lint/v2 v2.11.2 h1:4Icd3mEqthcFcFww8L67OBtfKB/obXxko8aFUMqP/5w= +github.com/golangci/golangci-lint/v2 v2.11.2/go.mod h1:wexdFBIQNhHNhDe1oqzlGFE5dYUqlfccWJKWjoWF1GI= +github.com/golangci/golines v0.15.0 h1:Qnph25g8Y1c5fdo1X7GaRDGgnMHgnxh4Gk4VfPTtRx0= +github.com/golangci/golines v0.15.0/go.mod h1:AZjXd23tbHMpowhtnGlj9KCNsysj72aeZVVHnVcZx10= +github.com/golangci/misspell v0.8.0 h1:qvxQhiE2/5z+BVRo1kwYA8yGz+lOlu5Jfvtx2b04Jbg= +github.com/golangci/misspell v0.8.0/go.mod h1:WZyyI2P3hxPY2UVHs3cS8YcllAeyfquQcKfdeE9AFVg= +github.com/golangci/plugin-module-register v0.1.2 h1:e5WM6PO6NIAEcij3B053CohVp3HIYbzSuP53UAYgOpg= +github.com/golangci/plugin-module-register v0.1.2/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw= +github.com/golangci/revgrep v0.8.0 h1:EZBctwbVd0aMeRnNUsFogoyayvKHyxlV3CdUA46FX2s= +github.com/golangci/revgrep v0.8.0/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k= +github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e h1:ai0EfmVYE2bRA5htgAG9r7s3tHsfjIhN98WshBTJ9jM= +github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e/go.mod h1:Vrn4B5oR9qRwM+f54koyeH3yzphlecwERs0el27Fr/s= +github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e h1:gD6P7NEo7Eqtt0ssnqSJNNndxe69DOQ24A5h7+i3KpM= +github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e/go.mod h1:h+wZwLjUTJnm/P2rwlbJdRPZXOzaT36/FwnPnY2inzc= +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/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +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/gordonklaus/ineffassign v0.2.0 h1:Uths4KnmwxNJNzq87fwQQDDnbNb7De00VOk9Nu0TySs= +github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8IT3a59vmZp5Y9Lw= +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.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= +github.com/gostaticanalysis/comment v1.5.0 h1:X82FLl+TswsUMpMh17srGRuKaaXprTaytmEpgnKIDu8= +github.com/gostaticanalysis/comment v1.5.0/go.mod h1:V6eb3gpCv9GNVqb6amXzEUX3jXLVK/AdA+IrAMSqvEc= +github.com/gostaticanalysis/forcetypeassert v0.2.0 h1:uSnWrrUEYDr86OCxWa4/Tp2jeYDlogZiZHzGkWFefTk= +github.com/gostaticanalysis/forcetypeassert v0.2.0/go.mod h1:M5iPavzE9pPqWyeiVXSFghQjljW1+l/Uke3PXHS6ILY= +github.com/gostaticanalysis/nilerr v0.1.2 h1:S6nk8a9N8g062nsx63kUkF6AzbHGw7zzyHMcpu52xQU= +github.com/gostaticanalysis/nilerr v0.1.2/go.mod h1:A19UHhoY3y8ahoL7YKz6sdjDtduwTSI4CsymaC2htPA= +github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -88,54 +380,64 @@ github.com/hashicorp/go-cty v1.5.0 h1:EkQ/v+dDNUqnuVpmS5fPqyY71NXVgT5gf32+57xY8g github.com/hashicorp/go-cty v1.5.0/go.mod h1:lFUCG5kd8exDobgSfyj4ONE/dc822kiYMguVKdHGMLM= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo= +github.com/hashicorp/go-immutable-radix/v2 v2.1.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw= 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.8.0 h1:ie8S6RRY8RvB2usYZv+AAZ/wBvx2AU5p5QeP5j/FORs= -github.com/hashicorp/go-plugin v1.8.0/go.mod h1:BExt6KEaIYx804z8k4gRzRLEvxKVb+kn0NMcihqOqb8= +github.com/hashicorp/go-plugin v1.7.0 h1:YghfQH/0QmPNc/AZMTFE3ac8fipZyZECHdDPshfk+mA= +github.com/hashicorp/go-plugin v1.7.0/go.mod h1:BExt6KEaIYx804z8k4gRzRLEvxKVb+kn0NMcihqOqb8= github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48= github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.9.0 h1:CeOIz6k+LoN3qX9Z0tyQrPtiB1DFYRPfCIBtaXPSCnA= -github.com/hashicorp/go-version v1.9.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.9.5 h1:XHCjcMn2563ysuaQ9v9ec2FNc7c2PJOIEEGobAFeIx4= -github.com/hashicorp/hc-install v0.9.5/go.mod h1:ihEW4LshrNkxq2bU/MpVbKyn+yt1is2hYqUTHDGhG84= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4= +github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/hc-install v0.9.3 h1:1H4dgmgzxEVwT6E/d/vIL5ORGVKz9twRwDw+qA5Hyho= +github.com/hashicorp/hc-install v0.9.3/go.mod h1:FQlQ5I3I/X409N/J1U4pPeQQz1R3BoV0IysB7aiaQE0= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE= github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-exec v0.25.2 h1:fFLAVEtAjKdGfawGUXDnKooCnqJi+TuohT3W99AGbhk= -github.com/hashicorp/terraform-exec v0.25.2/go.mod h1:uaQV2oqVLqM4cixJryk6qIWS1qji3GtuwPG5pjGXYfc= +github.com/hashicorp/terraform-exec v0.25.0 h1:Bkt6m3VkJqYh+laFMrWIpy9KHYFITpOyzRMNI35rNaY= +github.com/hashicorp/terraform-exec v0.25.0/go.mod h1:dl9IwsCfklDU6I4wq9/StFDp7dNbH/h5AnfS1RmiUl8= github.com/hashicorp/terraform-json v0.27.2 h1:BwGuzM6iUPqf9JYM/Z4AF1OJ5VVJEEzoKST/tRDBJKU= github.com/hashicorp/terraform-json v0.27.2/go.mod h1:GzPLJ1PLdUG5xL6xn1OXWIjteQRT2CNT9o/6A9mi9hE= -github.com/hashicorp/terraform-json v0.27.3-0.20260213134036-298b8f6b673a h1:T7AMR21kjrbeEpN+KhGlyd31XXHsSZF5zg+ivfeYte4= -github.com/hashicorp/terraform-json v0.27.3-0.20260213134036-298b8f6b673a/go.mod h1:yjb5C2W07l8lmAzdyVgOLji0/D2IoHkR3rusBzUO4O0= -github.com/hashicorp/terraform-plugin-docs v0.25.0 h1:qHs1V257NxVe8tv6HS4UQfNqjaPP5eUlLeDf7jYk85U= -github.com/hashicorp/terraform-plugin-docs v0.25.0/go.mod h1:MQggCmY8zgP7R7E/cC0b0cmTvA9hSj3ZKyrrsDjRbLo= -github.com/hashicorp/terraform-plugin-framework v1.19.0 h1:q0bwyhxAOR3vfdgbk9iplv3MlTv/dhBHTXjQOtQDoBA= -github.com/hashicorp/terraform-plugin-framework v1.19.0/go.mod h1:YRXOBu0jvs7xp4AThBbX4mAzYaMJ1JgtFH//oGKxwLc= +github.com/hashicorp/terraform-plugin-docs v0.24.0 h1:YNZYd+8cpYclQyXbl1EEngbld8w7/LPOm99GD5nikIU= +github.com/hashicorp/terraform-plugin-docs v0.24.0/go.mod h1:YLg+7LEwVmRuJc0EuCw0SPLxuQXw5mW8iJ5ml/kvi+o= +github.com/hashicorp/terraform-plugin-framework v1.18.0 h1:Xy6OfqSTZfAAKXSlJ810lYvuQvYkOpSUoNMQ9l2L1RA= +github.com/hashicorp/terraform-plugin-framework v1.18.0/go.mod h1:eeFIf68PME+kenJeqSrIcpHhYQK0TOyv7ocKdN4Z35E= github.com/hashicorp/terraform-plugin-framework-validators v0.19.0 h1:Zz3iGgzxe/1XBkooZCewS0nJAaCFPFPHdNJd8FgE4Ow= github.com/hashicorp/terraform-plugin-framework-validators v0.19.0/go.mod h1:GBKTNGbGVJohU03dZ7U8wHqc2zYnMUawgCN+gC0itLc= -github.com/hashicorp/terraform-plugin-go v0.31.0 h1:0Fz2r9DQ+kNNl6bx8HRxFd1TfMKUvnrOtvJPmp3Z0q8= -github.com/hashicorp/terraform-plugin-go v0.31.0/go.mod h1:A88bDhd/cW7FnwqxQRz3slT+QY6yzbHKc6AOTtmdeS8= +github.com/hashicorp/terraform-plugin-go v0.30.0 h1:VmEiD0n/ewxbvV5VI/bYwNtlSEAXtHaZlSnyUUuQK6k= +github.com/hashicorp/terraform-plugin-go v0.30.0/go.mod h1:8d523ORAW8OHgA9e8JKg0ezL3XUO84H0A25o4NY/jRo= github.com/hashicorp/terraform-plugin-log v0.10.0 h1:eu2kW6/QBVdN4P3Ju2WiB2W3ObjkAsyfBsL3Wh1fj3g= github.com/hashicorp/terraform-plugin-log v0.10.0/go.mod h1:/9RR5Cv2aAbrqcTSdNmY1NRHP4E3ekrXRGjqORpXyB0= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1 h1:2yPUd7esMOpuTaG3y1iEla1iw+tla+3ZEkkBnmOAre4= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1/go.mod h1:sq8qsxh+PwdvTQFcd17kfCoBgQo46ADNMvCpKE7t/gY= -github.com/hashicorp/terraform-plugin-testing v1.16.0 h1:GB97nGnJ1hESpDrCjqZig38RodSF0gdRzxlDupLXP38= -github.com/hashicorp/terraform-plugin-testing v1.16.0/go.mod h1:eQPYAy9xFMV7xtIFX8Y+wJGtUB++HBl329zCF6PBMZk= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.39.0 h1:ltFG/dSs4mMHNpBqHptCtJqYM4FekUDJbUcWj+6HGlg= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.39.0/go.mod h1:xJk7ap8vRI/B2U6TrVs7bu/gTihyor8XBTLSs5Y6z2w= +github.com/hashicorp/terraform-plugin-testing v1.14.0 h1:5t4VKrjOJ0rg0sVuSJ86dz5K7PHsMO6OKrHFzDBerWA= +github.com/hashicorp/terraform-plugin-testing v1.14.0/go.mod h1:1qfWkecyYe1Do2EEOK/5/WnTyvC8wQucUkkhiGLg5nk= github.com/hashicorp/terraform-registry-address v0.4.0 h1:S1yCGomj30Sao4l5BMPjTGZmCNzuv7/GDTDX99E9gTk= github.com/hashicorp/terraform-registry-address v0.4.0/go.mod h1:LRS1Ay0+mAiRkUyltGT+UHWkIqTFvigGn/LbMshfflE= github.com/hashicorp/terraform-svchost v0.2.1 h1:ubvrTFw3Q7CsoEaX7V06PtCTKG3wu7GyyobAoN4eF3Q= github.com/hashicorp/terraform-svchost v0.2.1/go.mod h1:zDMheBLvNzu7Q6o9TBvPqiZToJcSuCLXjAXxBslSky4= github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8= github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= +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/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= 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/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -148,35 +450,108 @@ github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2 github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0= 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/jgautheron/goconst v1.8.2 h1:y0XF7X8CikZ93fSNT6WBTb/NElBu9IjaY7CCYQrCMX4= +github.com/jgautheron/goconst v1.8.2/go.mod h1:A0oxgBCHy55NQn6sYpO7UdnA9p+h7cPtoOZUmvNIako= github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94= github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8= +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/jjti/go-spancheck v0.6.5 h1:lmi7pKxa37oKYIMScialXUK6hP3iY5F1gu+mLBPgYB8= +github.com/jjti/go-spancheck v0.6.5/go.mod h1:aEogkeatBrbYsyW6y5TgDfihCulDYciL1B7rG2vSsrU= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +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.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +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.2.0 h1:y+MJN/UdL63QbFJHws9BVC5RpA2iq0kpjrFajTGivjQ= +github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY= +github.com/karamaru-alpha/copyloopvar v1.2.2 h1:yfNQvP9YaGQR7VaWLYcfZUlRP2eo2vhExWKxD/fP6q0= +github.com/karamaru-alpha/copyloopvar v1.2.2/go.mod h1:oY4rGZqZ879JkJMtX3RRkcXRkmUvH0x35ykgaKgsgJY= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kisielk/errcheck v1.10.0 h1:Lvs/YAHP24YKg08LA8oDw2z9fJVme090RAXd90S+rrw= +github.com/kisielk/errcheck v1.10.0/go.mod h1:kQxWMMVZgIkDq7U8xtG/n2juOjbLgZtedi0D+/VL/i8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kkHAIKE/contextcheck v1.1.6 h1:7HIyRcnyzxL9Lz06NGhiKvenXq7Zw6Q0UQu/ttjfJCE= +github.com/kkHAIKE/contextcheck v1.1.6/go.mod h1:3dDbMRNBFaq8HFXWC1JyvDSPm43CmE6IuHam8Wr0rkg= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kulti/thelper v0.7.1 h1:fI8QITAoFVLx+y+vSyuLBP+rcVIB8jKooNSCT2EiI98= +github.com/kulti/thelper v0.7.1/go.mod h1:NsMjfQEy6sd+9Kfw8kCP61W1I0nerGSYSFnGaxQkcbs= +github.com/kunwardeep/paralleltest v1.0.15 h1:ZMk4Qt306tHIgKISHWFJAO1IDQJLc6uDyJMLyncOb6w= +github.com/kunwardeep/paralleltest v1.0.15/go.mod h1:di4moFqtfz3ToSKxhNjhOZL+696QtJGCFe132CbBLGk= +github.com/lasiar/canonicalheader v1.1.2 h1:vZ5uqwvDbyJCnMhmFYimgMZnJMjwljN5VGY0VKbMXb4= +github.com/lasiar/canonicalheader v1.1.2/go.mod h1:qJCeLFS0G/QlLQ506T+Fk/fWMa2VmBUiEI2cuMK4djI= +github.com/ldez/exptostd v0.4.5 h1:kv2ZGUVI6VwRfp/+bcQ6Nbx0ghFWcGIKInkG/oFn1aQ= +github.com/ldez/exptostd v0.4.5/go.mod h1:QRjHRMXJrCTIm9WxVNH6VW7oN7KrGSht69bIRwvdFsM= github.com/ldez/go-git-cmd-wrapper/v2 v2.9.1 h1:QJRB9Gs5i/h6TVJI6yl09Qm6rNooznRiKwIw+VIxd90= github.com/ldez/go-git-cmd-wrapper/v2 v2.9.1/go.mod h1:0eUeas7XtKDPKQbB0KijfaMPbuQ/cIprtoTRiwaUoFg= +github.com/ldez/gomoddirectives v0.8.0 h1:JqIuTtgvFC2RdH1s357vrE23WJF2cpDCPFgA/TWDGpk= +github.com/ldez/gomoddirectives v0.8.0/go.mod h1:jutzamvZR4XYJLr0d5Honycp4Gy6GEg2mS9+2YX3F1Q= +github.com/ldez/grignotin v0.10.1 h1:keYi9rYsgbvqAZGI1liek5c+jv9UUjbvdj3Tbn5fn4o= +github.com/ldez/grignotin v0.10.1/go.mod h1:UlDbXFCARrXbWGNGP3S5vsysNXAPhnSuBufpTEbwOas= +github.com/ldez/structtags v0.6.1 h1:bUooFLbXx41tW8SvkfwfFkkjPYvFFs59AAMgVg6DUBk= +github.com/ldez/structtags v0.6.1/go.mod h1:YDxVSgDy/MON6ariaxLF2X09bh19qL7MtGBN5MrvbdY= +github.com/ldez/tagliatelle v0.7.2 h1:KuOlL70/fu9paxuxbeqlicJnCspCRjH0x8FW+NfgYUk= +github.com/ldez/tagliatelle v0.7.2/go.mod h1:PtGgm163ZplJfZMZ2sf5nhUT170rSuPgBimoyYtdaSI= +github.com/ldez/usetesting v0.5.0 h1:3/QtzZObBKLy1F4F8jLuKJiKBjjVFi1IavpoWbmqLwc= +github.com/ldez/usetesting v0.5.0/go.mod h1:Spnb4Qppf8JTuRgblLrEWb7IE6rDmUpGvxY3iRrzvDQ= +github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY= +github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA= +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/macabu/inamedparam v0.2.0 h1:VyPYpOc10nkhI2qeNUdh3Zket4fcZjEWe35poddBCpE= +github.com/macabu/inamedparam v0.2.0/go.mod h1:+Pee9/YfGe5LJ62pYXqB89lJ+0k5bsR8Wgz/C0Zlq3U= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/manuelarte/embeddedstructfieldcheck v0.4.0 h1:3mAIyaGRtjK6EO9E73JlXLtiy7ha80b2ZVGyacxgfww= +github.com/manuelarte/embeddedstructfieldcheck v0.4.0/go.mod h1:z8dFSyXqp+fC6NLDSljRJeNQJJDWnY7RoWFzV3PC6UM= +github.com/manuelarte/funcorder v0.5.0 h1:llMuHXXbg7tD0i/LNw8vGnkDTHFpTnWqKPI85Rknc+8= +github.com/manuelarte/funcorder v0.5.0/go.mod h1:Yt3CiUQthSBMBxjShjdXMexmzpP8YGvGLjrxJNkO2hA= +github.com/maratori/testableexamples v1.0.1 h1:HfOQXs+XgfeRBJ+Wz0XfH+FHnoY9TVqL6Fcevpzy4q8= +github.com/maratori/testableexamples v1.0.1/go.mod h1:XE2F/nQs7B9N08JgyRmdGjYVGqxWwClLPCGSQhXQSrQ= +github.com/maratori/testpackage v1.1.2 h1:ffDSh+AgqluCLMXhM19f/cpvQAKygKAJXFl9aUjmbqs= +github.com/maratori/testpackage v1.1.2/go.mod h1:8F24GdVDFW5Ew43Et02jamrVMNXLUNaOynhDssITGfc= +github.com/matoous/godox v1.1.0 h1:W5mqwbyWrwZv6OQ5Z1a/DHGMOvXYCBP3+Ht7KMoJhq4= +github.com/matoous/godox v1.1.0/go.mod h1:jgE/3fUXiTurkdHOLT5WEkThTSuE7yxHv5iWPa80afs= +github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= 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.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= 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.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= -github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/maxatome/go-testdeep v1.14.0 h1:rRlLv1+kI8eOI3OaBXZwb3O7xY3exRzdW5QyX48g9wI= github.com/maxatome/go-testdeep v1.14.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM= +github.com/mgechev/revive v1.15.0 h1:vJ0HzSBzfNyPbHKolgiFjHxLek9KUijhqh42yGoqZ8Q= +github.com/mgechev/revive v1.15.0/go.mod h1:LlAKO3QQe9OJ0pVZzI2GPa8CbXGZ/9lNpCGvK4T/a8A= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +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 v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= @@ -186,50 +561,182 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.0/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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI= +github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U= +github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= +github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= +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/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= +github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= +github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhKRf3Swg= +github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= +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.23.0 h1:x3o4DGYOWbBMP/VdNQKgSj+25aJKx2Pe6lHr8gBcgf8= +github.com/nunnatsa/ginkgolinter v0.23.0/go.mod h1:9qN1+0akwXEccwV1CAcCDfcoBlWXHB+ML9884pL4SZ4= github.com/oklog/run v1.2.0 h1:O8x3yXwah4A73hJdlrwo/2X6J62gE5qTMusH0dvz60E= github.com/oklog/run v1.2.0/go.mod h1:mgDbKRSwPhJfesJ4PntqFUbKQRZ50NgmZTSPlFA0YFk= +github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= +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/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.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/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 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/quasilyte/go-ruleguard v0.4.5 h1:AGY0tiOT5hJX9BTdx/xBdoCubQUAE2grkqY2lSwvZcA= +github.com/quasilyte/go-ruleguard v0.4.5/go.mod h1:Vl05zJ538vcEEwu16V/Hdu7IYZWyKSwIy4c88Ro1kRE= +github.com/quasilyte/go-ruleguard/dsl v0.3.23 h1:lxjt5B6ZCiBeeNO8/oQsegE6fLeCzuMRoVWSkXC4uvY= +github.com/quasilyte/go-ruleguard/dsl v0.3.23/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +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/raeperd/recvcheck v0.2.0 h1:GnU+NsbiCqdC2XX5+vMZzP+jAJC5fht7rcVTAhX74UI= +github.com/raeperd/recvcheck v0.2.0/go.mod h1:n04eYkwIR0JbgD73wT8wL4JjPC3wm0nFtzBnWNocnYU= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.4.1 h1:eWC8eUMNZ/wM/PWuZBv7JxxqT5fiIKSIyTvjb7Elr+g= +github.com/ryancurrah/gomodguard v1.4.1/go.mod h1:qnMJwV1hX9m+YJseXEBhd2s90+1Xn6x9dLz11ualI1I= +github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= +github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= +github.com/sanposhiho/wastedassign/v2 v2.1.0 h1:crurBF7fJKIORrV85u9UUpePDYGWnwvv3+A96WvwXT0= +github.com/sanposhiho/wastedassign/v2 v2.1.0/go.mod h1:+oSmSC+9bQ+VUAxA66nBb0Z7N8CK7mscKTDYC6aIek4= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= +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.29.0 h1:8J0MoRrw4/NAXtjQqTHrbW9NN+3iMf7Knkq057v4XOQ= +github.com/sashamelentyev/usestdlibvars v1.29.0/go.mod h1:8PpnjHMk5VdeWlVb4wCdrB8PNbLqZ3wBZTZWkrpZZL8= +github.com/securego/gosec/v2 v2.24.7 h1:3k5yJnrhT1TTdsG0ZsnenlfCcT+7Y/+zeCPHbL7QAn8= +github.com/securego/gosec/v2 v2.24.7/go.mod h1:AdDJbjcG/XxFgVv7pW19vMNYlFM6+Q6Qy3t6lWAUcEY= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +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.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= +github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g= +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/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= +github.com/sonatard/noctx v0.5.0 h1:e/jdaqAsuWVOKQ0P6NWiIdDNHmHT5SwuuSfojFjzwrw= +github.com/sonatard/noctx v0.5.0/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas= +github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0= +github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= 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 v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= +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 v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stackitcloud/stackit-sdk-go/core v0.26.0 h1:jQEb9gkehfp6VCP6TcYk7BI10cz4l0KM2L6hqYBH2QA= -github.com/stackitcloud/stackit-sdk-go/core v0.26.0/go.mod h1:WU1hhxnjXw2EV7CYa1nlEvNpMiRY6CvmIOaHuL3pOaA= -github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.8.0 h1:oWTviJKdlUxaaARJghTjOqBbarIK+7+nH3Kc3Wxn4rQ= -github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.8.0/go.mod h1:yzlakB+f8ur4yAHR6lyCABO+HcEtZG3G2Faj6m5/uW8= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.10.0 h1:angvO3z0TGqZtdwTDsG/tgTw9hxB76A6leUsiUXQtME= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.10.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +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/stackitcloud/stackit-sdk-go/core v0.22.0 h1:6rViz7GnNwXSh51Lur5xuDzO8EWSZfN9J0HvEkBKq6c= +github.com/stackitcloud/stackit-sdk-go/core v0.22.0/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI= +github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.4.0 h1:4wfRYOEFSpNLPvOV0YNIoGLVQBIQNkCvZwmL7JFzphM= +github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.4.0/go.mod h1:tIYiqgnS9929dEhQjf6rx1yNsdFf59e4r2wcXQMkLYo= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.5.0 h1:JeSnhioDCfV5K4V4mOjKtKgkgNtrkrU9bkt7JBs57lA= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.5.0/go.mod h1:3NQNKhHYIjIHTmf6RAcYLdnq17a8AZKkqFCu9Q/Y/3Y= +github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g= +github.com/stbenjam/no-sprintf-host-port v0.3.1/go.mod h1:ODbZesTCHMVKthBHskvUUexdcNHAQRXk9NpSsL8p/HQ= 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.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= 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.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/teambition/rrule-go v1.8.2 h1:lIjpjvWTj9fFUZCmuoVDrKVOtdiyzbzc93qTmRVe/J8= github.com/teambition/rrule-go v1.8.2/go.mod h1:Ieq5AbrKGciP1V//Wq8ktsTXwSwJHDD5mD/wLBGl3p4= +github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= +github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= +github.com/tetafro/godot v1.5.4 h1:u1ww+gqpRLiIA16yF2PV1CV1n/X3zhyezbNXC3E14Sg= +github.com/tetafro/godot v1.5.4/go.mod h1:eOkMrVQurDui411nBY2FA05EYH01r14LuWY/NrVDVcU= +github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk= +github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460= +github.com/timonwong/loggercheck v0.11.0 h1:jdaMpYBl+Uq9mWPXv1r8jc5fC3gyXx4/WGwTnnNKn4M= +github.com/timonwong/loggercheck v0.11.0/go.mod h1:HEAWU8djynujaAVX7QI65Myb8qgfcZ1uKbdpg3ZzKl8= +github.com/tomarrell/wrapcheck/v2 v2.12.0 h1:H/qQ1aNWz/eeIhxKAFvkfIA+N7YDvq6TWVFL27Of9is= +github.com/tomarrell/wrapcheck/v2 v2.12.0/go.mod h1:AQhQuZd0p7b6rfW+vUwHm5OMCGgp63moQ9Qr/0BpIWo= +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/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLkI= +github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA= +github.com/ultraware/whitespace v0.2.0 h1:TYowo2m9Nfj1baEQBjuHzvMRbp19i+RCcRYrSWoFa+g= +github.com/ultraware/whitespace v0.2.0/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= +github.com/uudashr/gocognit v1.2.1 h1:CSJynt5txTnORn/DkhiB4mZjwPuifyASC8/6Q0I/QS4= +github.com/uudashr/gocognit v1.2.1/go.mod h1:acaubQc6xYlXFEMb9nWX2dYBzJ/bIjEkc1zzvyIZg5Q= +github.com/uudashr/iface v1.4.1 h1:J16Xl1wyNX9ofhpHmQ9h9gk5rnv2A6lX/2+APLTo0zU= +github.com/uudashr/iface v1.4.1/go.mod h1:pbeBPlbuU2qkNDn0mmfrxP2X+wjPMIQAy+r1MBXSXtg= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -239,106 +746,446 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/xen0n/gosmopolitan v1.3.0 h1:zAZI1zefvo7gcpbCOrPSHJZJYA9ZgLfJqtKzZ5pHqQM= +github.com/xen0n/gosmopolitan v1.3.0/go.mod h1:rckfr5T6o4lBtM1ga7mLGKZmLxswUoH1zxHgNXOsEt4= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= +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.3.0 h1:JVDbMp08lVCP7Y6NP3qHroGAO6z2yGKQtS5JsjqtoFs= +github.com/yeya24/promlinter v0.3.0/go.mod h1:cDfJQQYv9uYciW60QT0eeHlFodotkYZlL+YcPQN+mW4= +github.com/ykadowak/zerologlint v0.1.5 h1:Gy/fMz1dFQN9JZTPjv1hxEk+sRWm05row04Yoolgdiw= +github.com/ykadowak/zerologlint v0.1.5/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= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU= github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= -github.com/zclconf/go-cty v1.18.1 h1:yEGE8M4iIZlyKQURZNb2SnEyZlZHUcBCnx6KF81KuwM= -github.com/zclconf/go-cty v1.18.1/go.mod h1:qpnV6EDNgC1sns/AleL1fvatHw72j+S+nS+MJ+T2CSg= +github.com/zclconf/go-cty v1.18.0 h1:pJ8+HNI4gFoyRNqVE37wWbJWVw43BZczFo7KUoRczaA= +github.com/zclconf/go-cty v1.18.0/go.mod h1:qpnV6EDNgC1sns/AleL1fvatHw72j+S+nS+MJ+T2CSg= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= +gitlab.com/bosi/decorder v0.4.2 h1:qbQaV3zgwnBZ4zPMhGLW4KZe7A7NwxEhJx39R3shffo= +gitlab.com/bosi/decorder v0.4.2/go.mod h1:muuhHoaJkA9QLcYHq4Mj8FJUwDZ+EirSHRiaTcTf6T8= +go-simpler.org/musttag v0.14.0 h1:XGySZATqQYSEV3/YTy+iX+aofbZZllJaqwFWs+RTtSo= +go-simpler.org/musttag v0.14.0/go.mod h1:uP8EymctQjJ4Z1kUnjX0u2l60WfUdQxCwSNKzE1JEOE= +go-simpler.org/sloglint v0.11.1 h1:xRbPepLT/MHPTCA6TS/wNfZrDzkGvCCqUv4Bdwc3H7s= +go-simpler.org/sloglint v0.11.1/go.mod h1:2PowwiCOK8mjiF+0KGifVOT8ZsCNiFzvfyJeJOIt8MQ= go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw= go.abhg.dev/goldmark/frontmatter v0.2.0/go.mod h1:XqrEkZuM57djk7zrlRUB02x8I5J0px76YjkOzhB4YlU= +go.augendre.info/arangolint v0.4.0 h1:xSCZjRoS93nXazBSg5d0OGCi9APPLNMmmLrC995tR50= +go.augendre.info/arangolint v0.4.0/go.mod h1:l+f/b4plABuFISuKnTGD4RioXiCCgghv2xqst/xOvAA= +go.augendre.info/fatcontext v0.9.0 h1:Gt5jGD4Zcj8CDMVzjOJITlSb9cEch54hjRRlN3qDojE= +go.augendre.info/fatcontext v0.9.0/go.mod h1:L94brOAT1OOUNue6ph/2HnwxoNlds9aXDF2FcUntbNw= +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= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48= +go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8= +go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0= +go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs= +go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18= +go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE= +go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8= +go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew= +go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI= +go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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-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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= -golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= +golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +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= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +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-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o= +golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= +golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/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-20260209203927-2842357ff358 h1:qWFG1Dj7TBjOjOvhEOkmyGPVoquqUKnIU0lEVLp8xyk= +golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358/go.mod h1:4Mzdyp/6jzw9auFDJ3OMF5qksa7UvPnzKqTVGcb04ms= +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= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +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.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= -golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= +golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= +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-20181114220301-adae6a3d119a/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-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= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +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-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-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= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +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-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= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= -golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= +golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +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= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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-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= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +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= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-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-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/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= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-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= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= -golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +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.8.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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= 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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= -golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= +golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +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= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/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.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= -golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= +golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +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/tools v0.0.0-20180917221912-90fa682c2a6e/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-20190311212946-11955173bddd/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-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +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-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/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-20191012152004-8de300cfc20a/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-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= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/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-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= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +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-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-20200501065659-ab2804fb9c9d/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-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +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-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= +golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= +golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= -gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= +gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +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.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= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +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.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= 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/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 h1:pfIbyB44sWzHiCpRqIen67ZQnVXSfIxWrqUMk1qwODE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/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-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= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +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-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-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/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= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +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.79.2 h1:fRMD94s2tITpyJGtBBn7MkMseNpOZU8ZxgC3MMBaXRU= +google.golang.org/grpc v1.79.2/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= +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= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +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.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.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +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/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +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= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +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.7.0 h1:w6WUp1VbkqPEgLz4rkBzH/CSU6HkoqNLp6GstyTx3lU= +honnef.co/go/tools v0.7.0/go.mod h1:pm29oPxeP3P82ISxZDgIYeOaf9ta6Pi0EWvCFoLG2vc= +mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4= +mvdan.cc/gofumpt v0.9.2/go.mod h1:iB7Hn+ai8lPvofHd9ZFGVg2GOr8sBUw1QUWjNbmIL/s= +mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 h1:ssMzja7PDPJV8FStj7hq9IKiuiKhgz9ErWw+m68e7DI= +mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15/go.mod h1:4M5MMXl2kW6fivUT6yRGpLLPNfuGtU2Z0cPvFquGDYU= +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= diff --git a/golang-ci.yaml.bak b/golang-ci.yaml.bak deleted file mode 100644 index 11f74066..00000000 --- a/golang-ci.yaml.bak +++ /dev/null @@ -1,97 +0,0 @@ - -version: "2" -run: - concurrency: 4 -output: - formats: - text: - print-linter-name: true - print-issued-lines: true - colors: true - path: stdout -linters: - enable: - - bodyclose - - depguard - - errorlint - - forcetypeassert - - gochecknoinits - - gocritic - - gosec - - misspell - - nakedret - - revive - - sqlclosecheck - - wastedassign - disable: - - noctx - - unparam - settings: - depguard: - rules: - main: - list-mode: lax - allow: - - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview - - github.com/hashicorp/terraform-plugin-framework - - github.com/hashicorp/terraform-plugin-log - - github.com/stackitcloud/stackit-sdk-go - deny: - - pkg: github.com/stretchr/testify - desc: Do not use a testing framework - gocritic: - disabled-checks: - - wrapperFunc - - typeDefFirst - - ifElseChain - - dupImport - - hugeParam - enabled-tags: - - performance - - style - - experimental - gosec: - excludes: - - G104 - - G102 - - G304 - - G307 - misspell: - locale: US - nakedret: - max-func-lines: 0 - revive: - severity: error - rules: - - name: errorf - - name: context-as-argument - - name: error-return - - name: increment-decrement - - name: indent-error-flow - - name: superfluous-else - - name: unused-parameter - - name: unreachable-code - - name: atomic - - name: empty-lines - - name: early-return - exclusions: - paths: - - stackit-sdk-generator/ - - generated/ - - pkg_gen/ - generated: lax - warn-unused: true - # Excluding configuration per-path, per-linter, per-text and per-source. - rules: - # Exclude some linters from running on tests files. - - path: _test\.go - linters: - - gochecknoinits -formatters: - enable: - - gofmt - - goimports - settings: - goimports: - local-prefixes: - - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview \ No newline at end of file diff --git a/internal/testutils/functions.go b/internal/testutils/functions.go index f797259a..5b8f2970 100644 --- a/internal/testutils/functions.go +++ b/internal/testutils/functions.go @@ -53,7 +53,7 @@ func CreateTemporaryHome(createValidCredentialsFile bool, t *testing.T) string { // Define content, default = invalid token token := "foo_token" - // if createValidCredentialsFile { + //if createValidCredentialsFile { // token = GetTestProjectServiceAccountJson("") //} if _, err = file.WriteString(token); err != nil { diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go index cfe400cd..142efe13 100644 --- a/internal/testutils/testutils.go +++ b/internal/testutils/testutils.go @@ -99,7 +99,7 @@ func ResourceNameWithDateTime(name string) string { return fmt.Sprintf("tf-acc-%s-%s", name, dateTimeTrimmed) } -// func GetTestProjectServiceAccountJson(path string) string { +//func GetTestProjectServiceAccountJson(path string) string { // var err error // json, ok := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_JSON_CONTENT") // if !ok || json == "" { @@ -153,7 +153,7 @@ func ResourceNameWithDateTime(name string) string { // return credentials.TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_TOKEN, nil //} -// func readTestServiceAccountJsonFromFile(path string) (string, error) { +//func readTestServiceAccountJsonFromFile(path string) (string, error) { // if path == "" { // customPath, ok := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_FILE") // if !ok || customPath == "" { diff --git a/sample/.gitignore b/sample/.gitignore deleted file mode 100644 index 47c8ccc7..00000000 --- a/sample/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.json -*.bak -*.tfstate -*.tfstate.backup -terraform -variables.tf -*.tfrc diff --git a/sample/alpha-from-registry/key.tf b/sample/alpha-from-registry/key.tf deleted file mode 100644 index 8be28ac7..00000000 --- a/sample/alpha-from-registry/key.tf +++ /dev/null @@ -1,38 +0,0 @@ -resource "stackit_kms_keyring" "mshalpha-keyring" { - project_id = var.project_id - display_name = "msh-alpha-tests" - description = "This is a test keyring for private endpoints" -} - -resource "stackit_kms_key" "mshalpha-key01" { - project_id = var.project_id - keyring_id = stackit_kms_keyring.mshalpha-keyring.keyring_id - display_name = "mshalpha-key01" - protection = "software" - algorithm = "aes_256_gcm" - purpose = "symmetric_encrypt_decrypt" - access_scope = "SNA" -} - -output "keyid" { - value = stackit_kms_key.mshalpha-key01.key_id -} - -# (because stackit_kms_key.key001 is not in configuration) -resource "stackit_kms_key" "key001" { - access_scope = "SNA" - algorithm = "aes_256_gcm" - display_name = "msh-key-sna01" - keyring_id = stackit_kms_keyring.keyring001.keyring_id - project_id = var.project_id - protection = "software" - purpose = "symmetric_encrypt_decrypt" -} - -# stackit_kms_keyring.keyring001 will be destroyed -# (because stackit_kms_keyring.keyring001 is not in configuration) -resource "stackit_kms_keyring" "keyring001" { - description = "This is a test keyring for private endpoints" - display_name = "msh-keyring-sna01" - project_id = var.project_id -} diff --git a/sample/alpha-from-registry/postresql.tf b/sample/alpha-from-registry/postresql.tf deleted file mode 100644 index 0e728f81..00000000 --- a/sample/alpha-from-registry/postresql.tf +++ /dev/null @@ -1,96 +0,0 @@ - -data "stackitprivatepreview_postgresflexalpha_flavor" "pgsql_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 2 - ram = 4 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} - -resource "stackitprivatepreview_postgresflexalpha_instance" "msh-alpha-sna-enc" { - project_id = var.project_id - name = "msh-alpha-sna-enc" - backup_schedule = "0 0 * * *" - retention_days = 45 - flavor_id = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id - replicas = 1 - storage = { - performance_class = "premium-perf2-stackit" - size = 10 - } - encryption = { - kek_key_id = stackit_kms_key.mshalpha-key01.key_id - kek_key_ring_id = stackit_kms_keyring.mshalpha-keyring.keyring_id - kek_key_version = 1 - service_account = var.sa_email - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19", "170.85.2.177/32"] - access_scope = "SNA" - } - version = 17 -} - -resource "stackitprivatepreview_postgresflexalpha_instance" "msh-alpha-nosna-noenc" { - project_id = var.project_id - name = "msh-alpha-nosna-enc" - backup_schedule = "0 0 * * *" - retention_days = 45 - flavor_id = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id - replicas = 1 - storage = { - performance_class = "premium-perf2-stackit" - size = 10 - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19", "170.85.2.177/32"] - access_scope = "PUBLIC" - } - version = 16 -} - -resource "stackitprivatepreview_postgresflexalpha_user" "ptlsdbadminuser" { - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-alpha-sna-enc.instance_id - name = var.db_admin_username - roles = ["createdb", "login"] - # roles = ["createdb", "login", "createrole"] -} - -resource "stackitprivatepreview_postgresflexalpha_user" "ptlsdbuser" { - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-alpha-sna-enc.instance_id - name = var.db_username - roles = ["login"] - # roles = ["createdb", "login", "createrole"] -} - -resource "stackitprivatepreview_postgresflexalpha_database" "example" { - count = 5 - depends_on = [stackitprivatepreview_postgresflexalpha_user.ptlsdbadminuser] - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-alpha-sna-enc.instance_id - name = "${var.db_name}${count.index}" - owner = var.db_admin_username -} - -# data "stackitprivatepreview_postgresflexalpha_instance" "datapsql" { -# project_id = var.project_id -# instance_id = var.instance_id -# region = "eu01" -# } - -# output "psql_instance_id" { -# value = data.stackitprivatepreview_postgresflexalpha_instance.datapsql.instance_id -# } - -output "psql_user_password" { - value = stackitprivatepreview_postgresflexalpha_user.ptlsdbuser.password - sensitive = true -} - -# output "psql_user_conn" { -# value = stackitprivatepreview_postgresflexalpha_user.ptlsdbuser.connection_string -# sensitive = true -# } diff --git a/sample/alpha-from-registry/providers.tf b/sample/alpha-from-registry/providers.tf deleted file mode 100644 index 66756cd7..00000000 --- a/sample/alpha-from-registry/providers.tf +++ /dev/null @@ -1,24 +0,0 @@ - -terraform { - required_providers { - stackit = { - source = "registry.terraform.io/stackitcloud/stackit" - version = "~> 0.70" - } - stackitprivatepreview = { - source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = ">=0.1.0" - } - } -} - -provider "stackit" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "../service_account.json" -} - -provider "stackitprivatepreview" { - default_region = "eu01" - service_account_key_path = "../service_account.json" -} diff --git a/sample/config.tfrc.example b/sample/config.tfrc.example deleted file mode 100644 index a9adc18f..00000000 --- a/sample/config.tfrc.example +++ /dev/null @@ -1,10 +0,0 @@ -provider_installation { - dev_overrides { - "registry.terraform.io/mhenselin/stackitprivatepreview" = "/bin/" - } - - # For all other providers, install them directly from their origin provider - # registries as normal. If you omit this, Terraform will _only_ use - # the dev_overrides block, and so no other providers will be available. - direct {} -} diff --git a/sample/kms/kms.tf b/sample/kms/kms.tf deleted file mode 100644 index 01b1d46c..00000000 --- a/sample/kms/kms.tf +++ /dev/null @@ -1,57 +0,0 @@ -resource "stackit_kms_keyring" "keyring001" { - project_id = var.project_id - display_name = "msh-keyring-sna01" - description = "This is a test keyring for private endpoints" -} - -resource "stackit_kms_key" "key001" { - project_id = var.project_id - keyring_id = stackit_kms_keyring.keyring001.keyring_id - display_name = "msh-key-sna01" - protection = "software" - algorithm = "aes_256_gcm" - purpose = "symmetric_encrypt_decrypt" - access_scope = "SNA" -} - - -# data "stackitprivatepreview_sqlserverflexalpha_instance" "test" { -# project_id = var.project_id -# instance_id = var.instance_id -# region = "eu01" -# } - -output "key_ring_id" { - value = stackit_kms_keyring.keyring001.id -} - -resource "stackit_kms_keyring" "keyring001yy" { - project_id = var.project_id - display_name = "msh-kr-sna01" - description = "This is a test keyring for private endpoints" -} - -resource "stackit_kms_key" "key001yy" { - project_id = var.project_id - keyring_id = stackit_kms_keyring.keyring001yy.keyring_id - display_name = "msh-k-001" - protection = "software" - algorithm = "aes_256_gcm" - purpose = "symmetric_encrypt_decrypt" - access_scope = "SNA" -} - - -# data "stackitprivatepreview_sqlserverflexalpha_instance" "test" { -# project_id = var.project_id -# instance_id = var.instance_id -# region = "eu01" -# } - -output "key_ring_idxx" { - value = stackit_kms_keyring.keyring001yy.id -} - -output "key_id" { - value = stackit_kms_key.key001yy.id -} diff --git a/sample/kms/providers.tf b/sample/kms/providers.tf deleted file mode 100644 index 1e7fe4f5..00000000 --- a/sample/kms/providers.tf +++ /dev/null @@ -1,25 +0,0 @@ - -terraform { - required_providers { - stackit = { - source = "registry.terraform.io/stackitcloud/stackit" - version = "~> 0.70" - } - # stackitprivatepreview = { - # source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - # version = "= 0.0.2-alpha" - # } - } -} - -provider "stackit" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "../service_account.json" -} - -# provider "stackitprivatepreview" { -# default_region = "eu01" -# enable_beta_resources = true -# service_account_key_path = "../service_account.json" -# } diff --git a/sample/pg_import/outputs.tf b/sample/pg_import/outputs.tf deleted file mode 100644 index d9edf19a..00000000 --- a/sample/pg_import/outputs.tf +++ /dev/null @@ -1,4 +0,0 @@ -# -# output "postgres_flavor" { -# value = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id -# } diff --git a/sample/pg_import/postresql.tf b/sample/pg_import/postresql.tf deleted file mode 100644 index 1d8d478d..00000000 --- a/sample/pg_import/postresql.tf +++ /dev/null @@ -1,45 +0,0 @@ - -data "stackitprivatepreview_postgresflexalpha_flavor" "pgsql_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 2 - ram = 4 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} - -resource "stackitprivatepreview_postgresflexalpha_instance" "import_for_deletion" { - project_id = var.project_id - name = "mshpetest2" - backup_schedule = "0 0 * * *" - retention_days = 45 - flavor_id = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id - replicas = 1 - storage = { - # class = "premium-perf2-stackit" - performance_class = "premium-perf2-stackit" - size = 10 - } - encryption = { - # key_id = stackit_kms_key.key.key_id - # keyring_id = stackit_kms_keyring.keyring.keyring_id - kek_key_id = var.key_id - kek_key_ring_id = var.keyring_id - kek_key_version = var.key_version - service_account = var.sa_email - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19", "170.85.2.177/32"] - access_scope = "PUBLIC" - } - version = 14 -} - -import { - to = stackitprivatepreview_postgresflexalpha_instance.import_for_deletion - identity = { - project_id = var.project_id - region = "eu01" - instance_id = "d52b5d4c-be3f-4c14-a107-330dab99fd2e" - } -} diff --git a/sample/pg_import/providers.tf b/sample/pg_import/providers.tf deleted file mode 100644 index 5a54a129..00000000 --- a/sample/pg_import/providers.tf +++ /dev/null @@ -1,25 +0,0 @@ - -terraform { - required_providers { - # stackit = { - # source = "registry.terraform.io/stackitcloud/stackit" - # version = "~> 0.70" - # } - stackitprivatepreview = { - source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = "> 0.0" - } - } -} - -# provider "stackit" { -# default_region = "eu01" -# enable_beta_resources = true -# service_account_key_path = "./service_account.json" -# } - -provider "stackitprivatepreview" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "../service_account.json" -} diff --git a/sample/pg_import/variables.tf.example b/sample/pg_import/variables.tf.example deleted file mode 100644 index 51a70be4..00000000 --- a/sample/pg_import/variables.tf.example +++ /dev/null @@ -1,11 +0,0 @@ -variable "project_id" { - default = "" -} - -variable "sa_email" { - default = "" -} - -variable "db_username" { - default = "" -} diff --git a/sample/pg_instance/outputs.tf b/sample/pg_instance/outputs.tf deleted file mode 100644 index e69de29b..00000000 diff --git a/sample/pg_instance/postresql.tf b/sample/pg_instance/postresql.tf deleted file mode 100644 index 0f3f73ac..00000000 --- a/sample/pg_instance/postresql.tf +++ /dev/null @@ -1,17 +0,0 @@ - -data "stackitprivatepreview_postgresflexalpha_flavor" "pgsql_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 2 - ram = 4 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} -data "stackitprivatepreview_postgresflexalpha_flavor" "pgsql_flavor2"{ - project_id = var.project_id - region = "eu01" - cpu = 2 - ram = 4 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} diff --git a/sample/pg_instance/providers.tf b/sample/pg_instance/providers.tf deleted file mode 100644 index f69b01a1..00000000 --- a/sample/pg_instance/providers.tf +++ /dev/null @@ -1,25 +0,0 @@ - -terraform { - required_providers { - # stackit = { - # source = "registry.terraform.io/stackitcloud/stackit" - # version = "~> 0.70" - # } - stackitprivatepreview = { - source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = "> 0.0" - } - } -} - -# provider "stackit" { -# default_region = "eu01" -# enable_beta_resources = true -# service_account_key_path = "./service_account.json" -# } - -provider "stackitprivatepreview" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "/home/henselinm/Development/PTLS/terraform-provider-stackit-MSH/sample/pg_instance/service_account.json" -} diff --git a/sample/pg_instance/variables.tf.example b/sample/pg_instance/variables.tf.example deleted file mode 100644 index 51a70be4..00000000 --- a/sample/pg_instance/variables.tf.example +++ /dev/null @@ -1,11 +0,0 @@ -variable "project_id" { - default = "" -} - -variable "sa_email" { - default = "" -} - -variable "db_username" { - default = "" -} diff --git a/sample/postgres/outputs.tf b/sample/postgres/outputs.tf deleted file mode 100644 index 674ca8b9..00000000 --- a/sample/postgres/outputs.tf +++ /dev/null @@ -1,4 +0,0 @@ - -output "postgres_flavor" { - value = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id -} diff --git a/sample/postgres/postresql.tf b/sample/postgres/postresql.tf deleted file mode 100644 index 8679c669..00000000 --- a/sample/postgres/postresql.tf +++ /dev/null @@ -1,125 +0,0 @@ - -data "stackitprivatepreview_postgresflexalpha_flavor" "pgsql_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 2 - ram = 4 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} - -resource "stackitprivatepreview_postgresflexalpha_instance" "msh-sna-pe-example" { - project_id = var.project_id - name = "mshpetest2" - backup_schedule = "0 0 * * *" - retention_days = 45 - # flavor_id = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id - flavor = { - cpu = 2 - ram = 4 - } - replicas = 1 - storage = { - # class = "premium-perf2-stackit" - performance_class = "premium-perf2-stackit" - size = 10 - } - encryption = { - # key_id = stackit_kms_key.key.key_id - # keyring_id = stackit_kms_keyring.keyring.keyring_id - kek_key_id = var.key_id - kek_key_ring_id = var.keyring_id - kek_key_version = var.key_version - service_account = var.sa_email - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19", "170.85.2.177/32"] - access_scope = "PUBLIC" - } - version = 17 -} - -resource "stackitprivatepreview_postgresflexalpha_instance" "msh-sna-pe-example2" { - project_id = var.project_id - name = "mshpetest2-1" - backup_schedule = "0 0 * * *" - retention_days = 45 - flavor_id = data.stackitprivatepreview_postgresflexalpha_flavor.pgsql_flavor.flavor_id - replicas = 1 - storage = { - # class = "premium-perf2-stackit" - performance_class = "premium-perf2-stackit" - size = 10 - } - encryption = { - # key_id = stackit_kms_key.key.key_id - # keyring_id = stackit_kms_keyring.keyring.keyring_id - kek_key_id = var.key_id - kek_key_ring_id = var.keyring_id - kek_key_version = var.key_version - service_account = var.sa_email - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19", "170.85.2.177/32"] - access_scope = "SNA" - } - version = 16 -} - -resource "stackitprivatepreview_postgresflexalpha_user" "ptlsdbadminuser" { - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-sna-pe-example.instance_id - name = var.db_admin_username - roles = ["createdb", "login"] - # roles = ["createdb", "login", "login"] - # roles = ["createdb", "login", "createrole"] -} - -resource "stackitprivatepreview_postgresflexalpha_user" "ptlsdbadminuser2" { - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-sna-pe-example2.instance_id - name = var.db_admin_username - roles = ["createdb", "login"] - # roles = ["createdb", "login", "createrole"] -} - -resource "stackitprivatepreview_postgresflexalpha_user" "ptlsdbuser" { - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-sna-pe-example.instance_id - name = var.db_name - roles = ["login"] - # roles = ["createdb", "login", "createrole"] -} - -resource "stackitprivatepreview_postgresflexalpha_database" "example" { - count = 5 - depends_on = [stackitprivatepreview_postgresflexalpha_user.ptlsdbadminuser] - project_id = var.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-sna-pe-example.instance_id - name = "${var.db_name}${count.index}" - owner = var.db_admin_username -} - -# data "stackitprivatepreview_postgresflexalpha_instance" "datapsql" { -# project_id = var.project_id -# instance_id = var.instance_id -# region = "eu01" -# } - -# output "psql_instance_id" { -# value = data.stackitprivatepreview_postgresflexalpha_instance.datapsql.instance_id -# } - -output "psql_user_password" { - value = stackitprivatepreview_postgresflexalpha_user.ptlsdbuser.password - sensitive = true -} - -# output "psql_user_conn" { -# value = stackitprivatepreview_postgresflexalpha_user.ptlsdbuser.connection.host -# sensitive = true -# } - -output "determined_flavor_id" { - value = stackitprivatepreview_postgresflexalpha_instance.msh-sna-pe-example.flavor_id -} diff --git a/sample/postgres/providers.tf b/sample/postgres/providers.tf deleted file mode 100644 index 5a54a129..00000000 --- a/sample/postgres/providers.tf +++ /dev/null @@ -1,25 +0,0 @@ - -terraform { - required_providers { - # stackit = { - # source = "registry.terraform.io/stackitcloud/stackit" - # version = "~> 0.70" - # } - stackitprivatepreview = { - source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = "> 0.0" - } - } -} - -# provider "stackit" { -# default_region = "eu01" -# enable_beta_resources = true -# service_account_key_path = "./service_account.json" -# } - -provider "stackitprivatepreview" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "../service_account.json" -} diff --git a/sample/postgres/variables.tf.example b/sample/postgres/variables.tf.example deleted file mode 100644 index 51a70be4..00000000 --- a/sample/postgres/variables.tf.example +++ /dev/null @@ -1,11 +0,0 @@ -variable "project_id" { - default = "" -} - -variable "sa_email" { - default = "" -} - -variable "db_username" { - default = "" -} diff --git a/sample/sqlserver/flavor.tf b/sample/sqlserver/flavor.tf deleted file mode 100644 index c491cc09..00000000 --- a/sample/sqlserver/flavor.tf +++ /dev/null @@ -1,13 +0,0 @@ - -data "stackitprivatepreview_sqlserverflexbeta_flavor" "sqlserver_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 4 - ram = 16 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} - -output "sqlserver_flavor" { - value = data.stackitprivatepreview_sqlserverflexbeta_flavor.sqlserver_flavor.flavor_id -} diff --git a/sample/sqlserver/providers.tf b/sample/sqlserver/providers.tf deleted file mode 100644 index 233d4df2..00000000 --- a/sample/sqlserver/providers.tf +++ /dev/null @@ -1,25 +0,0 @@ - -terraform { - required_providers { - # stackit = { - # source = "registry.terraform.io/stackitcloud/stackit" - # version = "~> 0.70" - # } - stackitprivatepreview = { - source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = "> 0.0" - } - } -} - -# provider "stackit" { -# default_region = "eu01" -# enable_beta_resources = true -# service_account_key_path = "../service_account.json" -# } - -provider "stackitprivatepreview" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "../service_account.json" -} diff --git a/sample/sqlserver/sqlserver.tf b/sample/sqlserver/sqlserver.tf deleted file mode 100644 index d18f499c..00000000 --- a/sample/sqlserver/sqlserver.tf +++ /dev/null @@ -1,63 +0,0 @@ -# resource "stackit_kms_keyring" "keyring" { -# project_id = var.project_id -# display_name = "msh-keyring01" -# description = "This is a test keyring for private endpoints" -# } -# -# resource "stackit_kms_key" "key" { -# project_id = var.project_id -# keyring_id = stackit_kms_keyring.keyring.keyring_id -# display_name = "msh-key01" -# protection = "software" -# algorithm = "aes_256_gcm" -# purpose = "symmetric_encrypt_decrypt" -# access_scope = "SNA" -# } -# -# output "keyid" { -# value = stackit_kms_key.key.key_id -# } - -resource "stackitprivatepreview_sqlserverflexbeta_instance" "msh-beta-sna-001" { - project_id = var.project_id - name = "msh-beta-sna-001" - backup_schedule = "0 3 * * *" - retention_days = 31 - flavor_id = data.stackitprivatepreview_sqlserverflexbeta_flavor.sqlserver_flavor.flavor_id - storage = { - class = "premium-perf2-stackit" - size = 10 - } - version = 2022 - encryption = { - #key_id = stackit_kms_key.key.key_id - #keyring_id = stackit_kms_keyring.keyring.keyring_id - #key_version = 1 - # key with scope public - # kek_key_id = "fe039bcf-8d7b-431a-801d-9e81371a6b7b" - kek_key_id = "c6878f92-ce55-4b79-8236-ba9d001d7967" # msh-k-001 - # key_id = var.key_id - # kek_key_ring_id = var.keyring_id - kek_key_ring_id = "0dea3f5f-9947-4dda-a9d3-18418832cefe" # msh-kr-sna01 - kek_key_version = var.key_version - service_account = var.sa_email - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19"] - access_scope = "SNA" - } -} - -resource "stackitprivatepreview_sqlserverflexbeta_user" "betauser" { - project_id = var.project_id - instance_id = stackitprivatepreview_sqlserverflexbeta_instance.msh-beta-sna-001.instance_id - username = "betauser" - roles = ["##STACKIT_DatabaseManager##", "##STACKIT_LoginManager##"] -} - -resource "stackitprivatepreview_sqlserverflexbeta_database" "betadb" { - project_id = var.project_id - instance_id = stackitprivatepreview_sqlserverflexbeta_instance.msh-beta-sna-001.instance_id - name = "mshtest002" - owner = stackitprivatepreview_sqlserverflexbeta_user.betauser.username -} diff --git a/sample/sqlserver/variables.tf.example b/sample/sqlserver/variables.tf.example deleted file mode 100644 index 51a70be4..00000000 --- a/sample/sqlserver/variables.tf.example +++ /dev/null @@ -1,11 +0,0 @@ -variable "project_id" { - default = "" -} - -variable "sa_email" { - default = "" -} - -variable "db_username" { - default = "" -} diff --git a/sample/sqlserver_beta/flavor.tf b/sample/sqlserver_beta/flavor.tf deleted file mode 100644 index df6f3305..00000000 --- a/sample/sqlserver_beta/flavor.tf +++ /dev/null @@ -1,13 +0,0 @@ -# -# data "stackitprivatepreview_sqlserverflexalpha_flavor" "sqlserver_flavor" { -# project_id = var.project_id -# region = "eu01" -# cpu = 4 -# ram = 16 -# node_type = "Single" -# storage_class = "premium-perf2-stackit" -# } -# -# output "sqlserver_flavor" { -# value = data.stackitprivatepreview_sqlserverflexalpha_flavor.sqlserver_flavor.flavor_id -# } diff --git a/sample/sqlserver_beta/postgres.tf b/sample/sqlserver_beta/postgres.tf deleted file mode 100644 index 0f45ff66..00000000 --- a/sample/sqlserver_beta/postgres.tf +++ /dev/null @@ -1,9 +0,0 @@ - -data "stackitprivatepreview_postgresflexalpha_flavor" "pgsql_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 2 - ram = 4 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} diff --git a/sample/sqlserver_beta/providers.tf b/sample/sqlserver_beta/providers.tf deleted file mode 100644 index 233d4df2..00000000 --- a/sample/sqlserver_beta/providers.tf +++ /dev/null @@ -1,25 +0,0 @@ - -terraform { - required_providers { - # stackit = { - # source = "registry.terraform.io/stackitcloud/stackit" - # version = "~> 0.70" - # } - stackitprivatepreview = { - source = "tfregistry.sysops.stackit.rocks/mhenselin/stackitprivatepreview" - version = "> 0.0" - } - } -} - -# provider "stackit" { -# default_region = "eu01" -# enable_beta_resources = true -# service_account_key_path = "../service_account.json" -# } - -provider "stackitprivatepreview" { - default_region = "eu01" - enable_beta_resources = true - service_account_key_path = "../service_account.json" -} diff --git a/sample/sqlserver_beta/sqlserver.tf b/sample/sqlserver_beta/sqlserver.tf deleted file mode 100644 index 21bf7d23..00000000 --- a/sample/sqlserver_beta/sqlserver.tf +++ /dev/null @@ -1,116 +0,0 @@ -data "stackitprivatepreview_sqlserverflexbeta_flavor" "sqlserver_flavor" { - project_id = var.project_id - region = "eu01" - cpu = 4 - ram = 16 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} - -data "stackitprivatepreview_sqlserverflexbeta_flavor" "sqlserver_flavor_2" { - project_id = var.project_id - region = "eu01" - cpu = 4 - ram = 32 - node_type = "Replica" - storage_class = "premium-perf2-stackit" -} - -resource "stackitprivatepreview_sqlserverflexbeta_instance" "msh-beta-nosna-001" { - project_id = var.project_id - name = "msh-beta-nosna-001-renamed" - backup_schedule = "0 3 * * *" - retention_days = 31 - flavor_id = data.stackitprivatepreview_sqlserverflexbeta_flavor.sqlserver_flavor.flavor_id - storage = { - class = "premium-perf2-stackit" - size = 50 - } - version = 2022 - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19"] - access_scope = "PUBLIC" - } -} - -resource "stackitprivatepreview_sqlserverflexbeta_instance" "msh-beta-sna-001" { - project_id = var.project_id - name = "msh-beta-sna-001" - backup_schedule = "0 3 * * *" - retention_days = 31 - flavor_id = data.stackitprivatepreview_sqlserverflexbeta_flavor.sqlserver_flavor.flavor_id - storage = { - class = "premium-perf2-stackit" - size = 5 - } - version = 2022 - encryption = { - #key_id = stackit_kms_key.key.key_id - #keyring_id = stackit_kms_keyring.keyring.keyring_id - #key_version = 1 - # key with scope public - kek_key_id = "fe039bcf-8d7b-431a-801d-9e81371a6b7b" - # key_id = var.key_id - kek_key_ring_id = var.keyring_id - kek_key_version = var.key_version - service_account = var.sa_email - } - network = { - acl = ["0.0.0.0/0", "193.148.160.0/19"] - access_scope = "SNA" - } -} - -resource "stackitprivatepreview_sqlserverflexbeta_user" "exampleuseruno" { - project_id = var.project_id - instance_id = stackitprivatepreview_sqlserverflexbeta_instance.msh-beta-nosna-001.instance_id - username = "exampleuserdue" - roles = ["##STACKIT_ProcessManager##", "##STACKIT_LoginManager##", "##STACKIT_ServerManager##"] -} - -resource "stackitprivatepreview_sqlserverflexbeta_user" "exampleuser" { - project_id = var.project_id - instance_id = stackitprivatepreview_sqlserverflexbeta_instance.msh-beta-nosna-001.instance_id - username = "exampleuser" - roles = ["##STACKIT_LoginManager##"] -} - - -resource "stackitprivatepreview_sqlserverflexbeta_database" "mshtest002" { - project_id = var.project_id - instance_id = stackitprivatepreview_sqlserverflexbeta_instance.msh-beta-nosna-001.instance_id - name = "mshtest002" - # owner = "dbuser" - owner = stackitprivatepreview_sqlserverflexbeta_user.exampleuseruno.username -} - - -# data "stackitprivatepreview_sqlserverflexbeta_database" "example" { -# project_id = var.project_id -# region = "eu01" -# instance_id = "b3b63d0c-35bf-4804-84ea-5abec2a8ae58" -# database_name = "mshtest001" -# } - -# output "dbdetails" { -# value = data.stackitprivatepreview_sqlserverflexbeta_database.example -# } -# - - -# resource "stackitprivatepreview_sqlserverflexbeta_database" "mshtest" { -# project_id = var.project_id -# instance_id = "b3b63d0c-35bf-4804-84ea-5abec2a8ae58" -# name = "mshtest" -# owner = "dbuser" -# } -# -# import { -# to = stackitprivatepreview_sqlserverflexbeta_database.mshtest -# identity = { -# project_id = var.project_id -# region = "eu01" -# instance_id = "b3b63d0c-35bf-4804-84ea-5abec2a8ae58" -# database_name = "mshtest" -# } -# } diff --git a/sample/sqlserver_beta/variables.tf.example b/sample/sqlserver_beta/variables.tf.example deleted file mode 100644 index 51a70be4..00000000 --- a/sample/sqlserver_beta/variables.tf.example +++ /dev/null @@ -1,11 +0,0 @@ -variable "project_id" { - default = "" -} - -variable "sa_email" { - default = "" -} - -variable "db_username" { - default = "" -} diff --git a/sample/tf.sh b/sample/tf.sh deleted file mode 100755 index 5b650bdc..00000000 --- a/sample/tf.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env bash - -# ./tf.sh apply > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2) - -usage() { - echo "$0 usage:" && grep "[[:space:]].)\ #" "$0" | sed 's/#//' | sed -r 's/([a-z])\)/-\1/'; - exit 0; -} - -[ $# -eq 0 ] && usage - -CONFIG_FOLDER=$(dirname "$0") -# BINARY=terraform -BINARY=tofu - -ADD="" - -while getopts ":b:hdirt" arg; do - case $arg in - b) # Set binary (default is terraform). - BINARY=${OPTARG} - shift 2 - ;; - d) # Set log level to DEBUG. - TF_LOG=DEBUG - export TF_LOG - shift - ;; - i) # Set log level to INFO. - TF_LOG=INFO - export TF_LOG - shift - ;; - r) # Set log level to INFO. - ADD="-refresh-only" - shift - ;; - t) # Set log level to TRACE. - TF_LOG=TRACE - export TF_LOG - shift - ;; - h | *) # Display help. - usage - ;; - esac -done - -TERRAFORM_CONFIG=${CONFIG_FOLDER}/config.tfrc -export TERRAFORM_CONFIG - -${BINARY} "$@" ${ADD} diff --git a/service_specs/sqlserverflex/alpha/collations_config.yml b/service_specs/sqlserverflex/alpha/collation_config.yml.bak similarity index 100% rename from service_specs/sqlserverflex/alpha/collations_config.yml rename to service_specs/sqlserverflex/alpha/collation_config.yml.bak diff --git a/service_specs/sqlserverflex/alpha/versions_config.yml b/service_specs/sqlserverflex/alpha/version_config.yml.bak similarity index 100% rename from service_specs/sqlserverflex/alpha/versions_config.yml rename to service_specs/sqlserverflex/alpha/version_config.yml.bak diff --git a/service_specs/sqlserverflex/beta/collations_config.yml b/service_specs/sqlserverflex/beta/collation_config.yml.disabled similarity index 92% rename from service_specs/sqlserverflex/beta/collations_config.yml rename to service_specs/sqlserverflex/beta/collation_config.yml.disabled index 3d5fbb69..d1160ec3 100644 --- a/service_specs/sqlserverflex/beta/collations_config.yml +++ b/service_specs/sqlserverflex/beta/collation_config.yml.disabled @@ -2,7 +2,7 @@ provider: name: stackitprivatepreview data_sources: - collations: + collation: read: path: /v3beta1/projects/{projectId}/regions/{region}/instances/{instanceId}/collations method: GET diff --git a/service_specs/sqlserverflex/beta/versions_config.yml b/service_specs/sqlserverflex/beta/versions_config.yml index c1ed0b00..70d79676 100644 --- a/service_specs/sqlserverflex/beta/versions_config.yml +++ b/service_specs/sqlserverflex/beta/versions_config.yml @@ -3,7 +3,7 @@ provider: name: stackitprivatepreview data_sources: - versions: + version: read: path: /v3beta1/projects/{projectId}/regions/{region}/versions method: GET diff --git a/stackit/internal/services/postgresflexalpha/database/datasources_gen/database_data_source_gen.go b/stackit/internal/services/postgresflexalpha/database/datasources_gen/database_data_source_gen.go index f4a08793..d5683a6c 100644 --- a/stackit/internal/services/postgresflexalpha/database/datasources_gen/database_data_source_gen.go +++ b/stackit/internal/services/postgresflexalpha/database/datasources_gen/database_data_source_gen.go @@ -45,7 +45,7 @@ func DatabaseDataSourceSchema(ctx context.Context) schema.Schema { MarkdownDescription: "The STACKIT project ID.", }, "region": schema.StringAttribute{ - Optional: true, + Required: true, Description: "The region which should be addressed", MarkdownDescription: "The region which should be addressed", Validators: []validator.String{ diff --git a/stackit/internal/services/postgresflexalpha/database/mapper.go b/stackit/internal/services/postgresflexalpha/database/mapper.go index 213c262f..6ce2200c 100644 --- a/stackit/internal/services/postgresflexalpha/database/mapper.go +++ b/stackit/internal/services/postgresflexalpha/database/mapper.go @@ -64,21 +64,17 @@ func mapResourceFields(source *v3alpha1api.GetDatabaseResponse, model *resourceM return fmt.Errorf("model input is nil") } - var databaseID int64 - if model.DatabaseId.ValueInt64() != 0 { - if source.Id != 0 { - if model.DatabaseId.ValueInt64() != int64(source.Id) { - return fmt.Errorf("retrieved ID does not match known ID") - } - } - databaseID = model.DatabaseId.ValueInt64() + var databaseId int64 + if model.Id.ValueInt64() != 0 { + databaseId = model.Id.ValueInt64() } else if source.Id != 0 { - databaseID = int64(source.Id) + databaseId = int64(source.Id) } else { return fmt.Errorf("database id not present") } - model.DatabaseId = types.Int64Value(databaseID) + model.Id = types.Int64Value(databaseId) + model.DatabaseId = types.Int64Value(databaseId) model.Name = types.StringValue(source.GetName()) model.Owner = types.StringValue(cleanString(source.Owner)) return nil diff --git a/stackit/internal/services/postgresflexalpha/database/mapper_test.go b/stackit/internal/services/postgresflexalpha/database/mapper_test.go index 30c62be1..684af672 100644 --- a/stackit/internal/services/postgresflexalpha/database/mapper_test.go +++ b/stackit/internal/services/postgresflexalpha/database/mapper_test.go @@ -160,7 +160,7 @@ func TestMapResourceFields(t *testing.T) { }, expected: expected{ model: &resourceModel{ - Id: types.StringNull(), + Id: types.Int64Value(1), Name: types.StringValue("my-db"), Owner: types.StringValue("my-owner"), DatabaseId: types.Int64Value(1), diff --git a/stackit/internal/services/postgresflexalpha/database/resource.go b/stackit/internal/services/postgresflexalpha/database/resource.go index 457dc242..6db70746 100644 --- a/stackit/internal/services/postgresflexalpha/database/resource.go +++ b/stackit/internal/services/postgresflexalpha/database/resource.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/identityschema" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion" @@ -30,6 +30,11 @@ var ( _ resource.ResourceWithConfigure = &databaseResource{} _ resource.ResourceWithImportState = &databaseResource{} _ resource.ResourceWithModifyPlan = &databaseResource{} + _ resource.ResourceWithIdentity = &databaseResource{} + + // Error message constants + extractErrorSummary = "extracting failed" + extractErrorMessage = "Extracting identity data: %v" ) // NewDatabaseResource is a helper function to simplify the provider implementation. @@ -40,6 +45,14 @@ func NewDatabaseResource() resource.Resource { // resourceModel describes the resource data model. type resourceModel = postgresflexalphaResGen.DatabaseModel +// DatabaseResourceIdentityModel describes the resource's identity attributes. +type DatabaseResourceIdentityModel struct { + ProjectID types.String `tfsdk:"project_id"` + Region types.String `tfsdk:"region"` + InstanceID types.String `tfsdk:"instance_id"` + DatabaseID types.Int64 `tfsdk:"database_id"` +} + // databaseResource is the resource implementation. type databaseResource struct { client *v3alpha1api.APIClient @@ -125,6 +138,30 @@ func (r *databaseResource) Schema(ctx context.Context, _ resource.SchemaRequest, resp.Schema = s } +// IdentitySchema defines the schema for the resource's identity attributes. +func (r *databaseResource) IdentitySchema( + _ context.Context, + _ resource.IdentitySchemaRequest, + response *resource.IdentitySchemaResponse, +) { + response.IdentitySchema = identityschema.Schema{ + Attributes: map[string]identityschema.Attribute{ + "project_id": identityschema.StringAttribute{ + RequiredForImport: true, + }, + "region": identityschema.StringAttribute{ + RequiredForImport: true, + }, + "instance_id": identityschema.StringAttribute{ + RequiredForImport: true, + }, + "database_id": identityschema.Int64Attribute{ + RequiredForImport: true, + }, + }, + } +} + // Create creates the resource and sets the initial Terraform state. func (r *databaseResource) Create( ctx context.Context, @@ -141,12 +178,12 @@ func (r *databaseResource) Create( ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() + projectId := model.ProjectId.ValueString() region := model.Region.ValueString() - instanceID := model.InstanceId.ValueString() + instanceId := model.InstanceId.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) // Generate API request body from model @@ -163,9 +200,9 @@ func (r *databaseResource) Create( // Create new database databaseResp, err := r.client.DefaultAPI.CreateDatabaseRequest( ctx, - projectID, + projectId, region, - instanceID, + instanceId, ).CreateDatabaseRequestPayload(*payload).Execute() if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, funcErrorSummary, fmt.Sprintf("Calling API: %v", err)) @@ -182,35 +219,25 @@ func (r *databaseResource) Create( ) return } - databaseID := int64(*dbID) - databaseIDString := strconv.Itoa(int(*dbID)) - - ctx = tflog.SetField(ctx, "database_id", databaseID) + databaseId := int64(*dbID) + ctx = tflog.SetField(ctx, "database_id", databaseId) ctx = core.LogResponse(ctx) - model.DatabaseId = types.Int64Value(databaseID) - model.Id = utils.BuildInternalTerraformId(projectID, region, instanceID, databaseIDString) + // Save identity into Terraform state + identity := DatabaseResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + DatabaseID: types.Int64Value(databaseId), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } - // Set data returned by API in id - resp.Diagnostics.Append( - resp.State.SetAttribute( - ctx, - path.Root("database_id"), - databaseID, - )..., - ) - // Set data returned by API in id - resp.Diagnostics.Append( - resp.State.SetAttribute( - ctx, - path.Root("id"), - model.Id, - )..., - ) - - database, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectID, instanceID, region, databaseID). - SetTimeout(30 * time.Minute). - SetSleepBeforeWait(10 * time.Second). + database, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region, databaseId). + SetTimeout(15 * time.Minute). + SetSleepBeforeWait(15 * time.Second). WaitWithContext(ctx) if err != nil { core.LogAndAddError( @@ -257,30 +284,19 @@ func (r *databaseResource) Read( ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() - instanceID := model.InstanceId.ValueString() + projectId := model.ProjectId.ValueString() + instanceId := model.InstanceId.ValueString() region := model.Region.ValueString() - databaseID := model.DatabaseId.ValueInt64() + databaseId := model.DatabaseId.ValueInt64() - databaseIDString := strconv.Itoa(int(databaseID)) - - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) - ctx = tflog.SetField(ctx, "database_id", databaseID) + ctx = tflog.SetField(ctx, "database_id", databaseId) - // Set data returned by API in id - resp.Diagnostics.Append( - resp.State.SetAttribute( - ctx, - path.Root("id"), - utils.BuildInternalTerraformId(projectID, region, instanceID, databaseIDString), - )..., - ) - - databaseResp, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectID, instanceID, region, databaseID). - SetTimeout(30 * time.Minute). - SetSleepBeforeWait(10 * time.Second). + databaseResp, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region, databaseId). + SetTimeout(15 * time.Minute). + SetSleepBeforeWait(15 * time.Second). WaitWithContext(ctx) if err != nil { core.LogAndAddError( @@ -306,6 +322,18 @@ func (r *databaseResource) Read( return } + // Save identity into Terraform state + identity := DatabaseResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + DatabaseID: types.Int64Value(int64(databaseResp.GetId())), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + // Set refreshed state diags = resp.State.Set(ctx, model) resp.Diagnostics.Append(diags...) @@ -386,8 +414,8 @@ func (r *databaseResource) Update( ctx = core.LogResponse(ctx) databaseResp, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region, databaseId). - SetTimeout(30 * time.Minute). - SetSleepBeforeWait(10 * time.Second). + SetTimeout(15 * time.Minute). + SetSleepBeforeWait(15 * time.Second). WaitWithContext(ctx) if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, "error updating database", err.Error()) @@ -408,6 +436,18 @@ func (r *databaseResource) Update( return } + // Save identity into Terraform state + identity := DatabaseResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + DatabaseID: types.Int64Value(databaseId), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + // Set state to fully populated data resp.Diagnostics.Append(resp.State.Set(ctx, &model)...) if resp.Diagnostics.HasError() { @@ -429,33 +469,38 @@ func (r *databaseResource) Delete( return } + // Read identity data + var identityData DatabaseResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } + ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() - instanceID := model.InstanceId.ValueString() - region := model.Region.ValueString() - databaseID64 := model.DatabaseId.ValueInt64() + projectId, region, instanceId, databaseId64, errExt := r.extractIdentityData(model, identityData) + if errExt != nil { + core.LogAndAddError( + ctx, + &resp.Diagnostics, + extractErrorSummary, + fmt.Sprintf(extractErrorMessage, errExt), + ) + } - if databaseID64 > math.MaxInt32 { + if databaseId64 > math.MaxInt32 { core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)") return } - databaseID := int32(databaseID64) // nolint:gosec // check is performed above - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) + databaseId := int32(databaseId64) // nolint:gosec // check is performed above + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) - ctx = tflog.SetField(ctx, "database_id", databaseID) + ctx = tflog.SetField(ctx, "database_id", databaseId) // Delete existing record set - err := r.client.DefaultAPI.DeleteDatabaseRequest(ctx, projectID, region, instanceID, databaseID).Execute() + err := r.client.DefaultAPI.DeleteDatabaseRequest(ctx, projectId, region, instanceId, databaseId).Execute() if err != nil { - oapiErr, ok := err.(*oapierror.GenericOpenAPIError) // nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped - if ok { - if oapiErr.StatusCode == 404 { - resp.State.RemoveResource(ctx) - return - } - } core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting database", fmt.Sprintf("Calling API: %v", err)) } @@ -472,44 +517,109 @@ func (r *databaseResource) ImportState( resp *resource.ImportStateResponse, ) { ctx = core.InitProviderContext(ctx) - idParts := strings.Split(req.ID, core.Separator) - if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" { - core.LogAndAddError( - ctx, &resp.Diagnostics, - "Error importing database", - fmt.Sprintf( - "Expected import identifier with format [project_id],[region],[instance_id],[database_id], got %q", - req.ID, - ), - ) - return - } + if req.ID != "" { + idParts := strings.Split(req.ID, core.Separator) - databaseID, err := strconv.ParseInt(idParts[3], 10, 64) - if err != nil { - core.LogAndAddError( + if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" { + core.LogAndAddError( + ctx, &resp.Diagnostics, + "Error importing database", + fmt.Sprintf( + "Expected import identifier with format [project_id],[region],[instance_id],[database_id], got %q", + req.ID, + ), + ) + return + } + + databaseId, err := strconv.ParseInt(idParts[3], 10, 64) + if err != nil { + core.LogAndAddError( + ctx, + &resp.Diagnostics, + "Error importing database", + fmt.Sprintf("Invalid database_id format: %q. It must be a valid integer.", idParts[3]), + ) + return + } + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("database_id"), databaseId)...) + + core.LogAndAddWarning( ctx, &resp.Diagnostics, - "Error importing database", - fmt.Sprintf("Invalid database_id format: %q. It must be a valid integer.", idParts[3]), + "Postgresflex database imported with empty password", + "The database password is not imported as it is only available upon creation of a new database. The password field will be empty.", ) + + tflog.Info(ctx, "Postgres Flex database state imported") + return } - tfIDString := utils.BuildInternalTerraformId(idParts...).ValueString() - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("id"), tfIDString)...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("database_id"), databaseID)...) + // If no ID is provided, attempt to read identity attributes from the import configuration + var identityData DatabaseResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } - core.LogAndAddWarning( - ctx, - &resp.Diagnostics, - "Postgresflex database imported with empty password", - "The database password is not imported as it is only available upon creation of a new database. The password field will be empty.", - ) + projectId := identityData.ProjectID.ValueString() + region := identityData.Region.ValueString() + instanceId := identityData.InstanceID.ValueString() + databaseId := identityData.DatabaseID.ValueInt64() + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), projectId)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), region)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), instanceId)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("database_id"), databaseId)...) tflog.Info(ctx, "Postgres Flex database state imported") } + +// extractIdentityData extracts essential identifiers from the resource model, falling back to the identity model. +func (r *databaseResource) extractIdentityData( + model resourceModel, + identity DatabaseResourceIdentityModel, +) (projectId, region, instanceId string, databaseId int64, err error) { + if !model.DatabaseId.IsNull() && !model.DatabaseId.IsUnknown() { + databaseId = model.DatabaseId.ValueInt64() + } else { + if identity.DatabaseID.IsNull() || identity.DatabaseID.IsUnknown() { + return "", "", "", 0, fmt.Errorf("database_id not found in config") + } + databaseId = identity.DatabaseID.ValueInt64() + } + + if !model.ProjectId.IsNull() && !model.ProjectId.IsUnknown() { + projectId = model.ProjectId.ValueString() + } else { + if identity.ProjectID.IsNull() || identity.ProjectID.IsUnknown() { + return "", "", "", 0, fmt.Errorf("project_id not found in config") + } + projectId = identity.ProjectID.ValueString() + } + + if !model.Region.IsNull() && !model.Region.IsUnknown() { + region = r.providerData.GetRegionWithOverride(model.Region) + } else { + if identity.Region.IsNull() || identity.Region.IsUnknown() { + return "", "", "", 0, fmt.Errorf("region not found in config") + } + region = r.providerData.GetRegionWithOverride(identity.Region) + } + + if !model.InstanceId.IsNull() && !model.InstanceId.IsUnknown() { + instanceId = model.InstanceId.ValueString() + } else { + if identity.InstanceID.IsNull() || identity.InstanceID.IsUnknown() { + return "", "", "", 0, fmt.Errorf("instance_id not found in config") + } + instanceId = identity.InstanceID.ValueString() + } + return projectId, region, instanceId, databaseId, nil +} diff --git a/stackit/internal/services/postgresflexalpha/database/resources_gen/database_resource_gen.go b/stackit/internal/services/postgresflexalpha/database/resources_gen/database_resource_gen.go index fe8871a2..6affc956 100644 --- a/stackit/internal/services/postgresflexalpha/database/resources_gen/database_resource_gen.go +++ b/stackit/internal/services/postgresflexalpha/database/resources_gen/database_resource_gen.go @@ -20,7 +20,7 @@ func DatabaseResourceSchema(ctx context.Context) schema.Schema { Description: "The ID of the database.", MarkdownDescription: "The ID of the database.", }, - "id": schema.StringAttribute{ + "id": schema.Int64Attribute{ Computed: true, Description: "The id of the database.", MarkdownDescription: "The id of the database.", @@ -65,7 +65,7 @@ func DatabaseResourceSchema(ctx context.Context) schema.Schema { type DatabaseModel struct { DatabaseId types.Int64 `tfsdk:"database_id"` - Id types.String `tfsdk:"id"` + Id types.Int64 `tfsdk:"id"` InstanceId types.String `tfsdk:"instance_id"` Name types.String `tfsdk:"name"` Owner types.String `tfsdk:"owner"` diff --git a/stackit/internal/services/postgresflexalpha/flavor/datasource.go b/stackit/internal/services/postgresflexalpha/flavor/datasource.go index ee7177f6..455baf14 100644 --- a/stackit/internal/services/postgresflexalpha/flavor/datasource.go +++ b/stackit/internal/services/postgresflexalpha/flavor/datasource.go @@ -11,7 +11,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion" - postgresflexalphaGen "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/flavor/datasources_gen" + postgresflexalphaGen "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/flavors/datasources_gen" postgresflexUtils "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/utils" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils" @@ -220,24 +220,14 @@ func (r *flavorDataSource) Read(ctx context.Context, req datasource.ReadRequest, } else { var scList []attr.Value for _, sc := range f.StorageClasses { - mIop := types.Int32Null() - if val, ok := sc.GetMaxIoPerSecOk(); ok { - mIop = types.Int32Value(*val) - } - - mThrough := types.Int32Null() - if val, ok := sc.GetMaxThroughInMbOk(); ok { - mThrough = types.Int32Value(*val) - } - scList = append( scList, postgresflexalphaGen.NewStorageClassesValueMust( postgresflexalphaGen.StorageClassesValue{}.AttributeTypes(ctx), map[string]attr.Value{ "class": types.StringValue(sc.Class), - "max_io_per_sec": mIop, - "max_through_in_mb": mThrough, + "max_io_per_sec": types.Int32Value(sc.MaxIoPerSec), + "max_through_in_mb": types.Int32Value(sc.MaxThroughInMb), }, ), ) diff --git a/stackit/internal/services/postgresflexalpha/flavors/datasource.go b/stackit/internal/services/postgresflexalpha/flavors/datasource.go index c70ec173..f5c99a82 100644 --- a/stackit/internal/services/postgresflexalpha/flavors/datasource.go +++ b/stackit/internal/services/postgresflexalpha/flavors/datasource.go @@ -1,4 +1,4 @@ -package postgresflexalphaflavors +package postgresflexalpha import ( "context" diff --git a/stackit/internal/services/postgresflexalpha/flavors/functions.go b/stackit/internal/services/postgresflexalpha/flavors/functions.go deleted file mode 100644 index 2135f8d0..00000000 --- a/stackit/internal/services/postgresflexalpha/flavors/functions.go +++ /dev/null @@ -1,65 +0,0 @@ -package postgresflexalphaflavors - -import ( - "context" - "fmt" - - "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" -) - -type flavorsClientReader interface { - GetFlavorsRequest( - ctx context.Context, - projectId, region string, - ) v3alpha1api.ApiGetFlavorsRequestRequest -} - -func getAllFlavors(ctx context.Context, client flavorsClientReader, projectId, region string) ( - []v3alpha1api.ListFlavors, - error, -) { - getAllFilter := func(_ v3alpha1api.ListFlavors) bool { return true } - flavorList, err := getFlavorsByFilter(ctx, client, projectId, region, getAllFilter) - if err != nil { - return nil, err - } - return flavorList, nil -} - -// getFlavorsByFilter is a helper function to retrieve flavors using a filtern function. -// Hint: The API does not have a GetFlavors endpoint, only ListFlavors -func getFlavorsByFilter( - ctx context.Context, - client flavorsClientReader, - projectId, region string, - filter func(db v3alpha1api.ListFlavors) bool, -) ([]v3alpha1api.ListFlavors, error) { - if projectId == "" || region == "" { - return nil, fmt.Errorf("listing postgresflex flavors: projectId and region are required") - } - - const pageSize = 25 - - var result = make([]v3alpha1api.ListFlavors, 0) - - for page := int32(1); ; page++ { - res, err := client.GetFlavorsRequest(ctx, projectId, region). - Page(page).Size(pageSize).Sort(v3alpha1api.FLAVORSORT_ID_ASC).Execute() - if err != nil { - return nil, fmt.Errorf("requesting flavors list (page %d): %w", page, err) - } - - // If the API returns no flavors, we have reached the end of the list. - if len(res.Flavors) == 0 { - break - } - - for _, flavor := range res.Flavors { - if filter(flavor) { - result = append(result, flavor) - } - } - } - - return result, nil -} diff --git a/stackit/internal/services/postgresflexalpha/flavors/functions_test.go b/stackit/internal/services/postgresflexalpha/flavors/functions_test.go deleted file mode 100644 index 8ca78e1f..00000000 --- a/stackit/internal/services/postgresflexalpha/flavors/functions_test.go +++ /dev/null @@ -1,135 +0,0 @@ -package postgresflexalphaflavors - -/* -import ( - "context" - "testing" - - postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" -) - -type mockRequest struct { - executeFunc func() (*postgresflex.GetFlavorsResponse, error) -} - -func (m *mockRequest) Page(_ int32) postgresflex.ApiGetFlavorsRequestRequest { return m } -func (m *mockRequest) Size(_ int32) postgresflex.ApiGetFlavorsRequestRequest { return m } -func (m *mockRequest) Sort(_ postgresflex.FlavorSort) postgresflex.ApiGetFlavorsRequestRequest { - return m -} -func (m *mockRequest) Execute() (*postgresflex.GetFlavorsResponse, error) { - return m.executeFunc() -} - -type mockFlavorsClient struct { - executeRequest func() postgresflex.ApiGetFlavorsRequestRequest -} - -func (m *mockFlavorsClient) GetFlavorsRequest(_ context.Context, _, _ string) postgresflex.ApiGetFlavorsRequestRequest { - return m.executeRequest() -} - -var mockResp = func(page int32) (*postgresflex.GetFlavorsResponse, error) { - if page == 1 { - return &postgresflex.GetFlavorsResponse{ - Flavors: []postgresflex.ListFlavors{ - {Id: "flavor-1", Description: "first"}, - {Id: "flavor-2", Description: "second"}, - }, - }, nil - } - if page == 2 { - return &postgresflex.GetFlavorsResponse{ - Flavors: []postgresflex.ListFlavors{ - {Id: "flavor-3", Description: "three"}, - }, - }, nil - } - - return &postgresflex.GetFlavorsResponse{ - Flavors: []postgresflex.ListFlavors{}, - }, nil -} - -func TestGetFlavorsByFilter(t *testing.T) { - tests := []struct { - description string - projectId string - region string - mockErr error - filter func(postgresflex.ListFlavors) bool - wantCount int - wantErr bool - }{ - { - description: "Success - Get all flavors (2 pages)", - projectId: "pid", region: "reg", - filter: func(_ postgresflex.ListFlavors) bool { return true }, - wantCount: 3, - wantErr: false, - }, - { - description: "Success - Filter flavors by description", - projectId: "pid", region: "reg", - filter: func(f postgresflex.ListFlavors) bool { return f.Description == "first" }, - wantCount: 1, - wantErr: false, - }, - { - description: "Error - Missing parameters", - projectId: "", region: "reg", - wantErr: true, - }, - } - - for _, tt := range tests { - t.Run( - tt.description, func(t *testing.T) { - var currentPage int32 - client := &mockFlavorsClient{ - executeRequest: func() postgresflex.ApiGetFlavorsRequestRequest { - return mockRequest{ - executeFunc: func() (*postgresflex.GetFlavorsResponse, error) { - currentPage++ - return mockResp(currentPage) - }, - } - }, - } - actual, err := getFlavorsByFilter(context.Background(), client, tt.projectId, tt.region, tt.filter) - - if (err != nil) != tt.wantErr { - t.Errorf("getFlavorsByFilter() error = %v, wantErr %v", err, tt.wantErr) - return - } - - if !tt.wantErr && len(actual) != tt.wantCount { - t.Errorf("getFlavorsByFilter() got %d flavors, want %d", len(actual), tt.wantCount) - } - }, - ) - } -} - -func TestGetAllFlavors(t *testing.T) { - var currentPage int32 - client := &mockFlavorsClient{ - executeRequest: func() postgresflex.ApiGetFlavorsRequestRequest { - return mockRequest{ - executeFunc: func() (*postgresflex.GetFlavorsResponse, error) { - currentPage++ - return mockResp(currentPage) - }, - } - }, - } - - res, err := getAllFlavors(context.Background(), client, "pid", "reg") - if err != nil { - t.Errorf("getAllFlavors() unexpected error: %v", err) - } - if len(res) != 3 { - t.Errorf("getAllFlavors() expected 3 flavor, got %d", len(res)) - } -} -*/ diff --git a/stackit/internal/services/postgresflexalpha/instance/datasource.go b/stackit/internal/services/postgresflexalpha/instance/datasource.go index edb1a9a9..cd7048e3 100644 --- a/stackit/internal/services/postgresflexalpha/instance/datasource.go +++ b/stackit/internal/services/postgresflexalpha/instance/datasource.go @@ -5,7 +5,6 @@ import ( "fmt" "net/http" - "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" @@ -73,13 +72,7 @@ func (r *instanceDataSource) Configure( // Schema defines the schema for the data source. func (r *instanceDataSource) Schema(ctx context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) { - sch := postgresflexalpha2.InstanceDataSourceSchema(ctx) - sch.Attributes["id"] = schema.StringAttribute{ - Computed: true, - Description: "internal ID", - MarkdownDescription: "internal ID", - } - resp.Schema = sch + resp.Schema = postgresflexalpha2.InstanceDataSourceSchema(ctx) } // Read refreshes the Terraform state with the latest data. @@ -97,22 +90,22 @@ func (r *instanceDataSource) Read( ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() - instanceID := model.InstanceId.ValueString() + projectId := model.ProjectId.ValueString() + instanceId := model.InstanceId.ValueString() region := r.providerData.GetRegionWithOverride(model.Region) - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) - instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { utils.LogError( ctx, &resp.Diagnostics, err, "Reading instance", - fmt.Sprintf("Instance with ID %q does not exist in project %q.", instanceID, projectID), + fmt.Sprintf("Instance with ID %q does not exist in project %q.", instanceId, projectId), map[int]string{ - http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectID), + http.StatusForbidden: fmt.Sprintf("Project with ID %q not found or forbidden access", projectId), }, ) resp.State.RemoveResource(ctx) diff --git a/stackit/internal/services/postgresflexalpha/instance/datasources_gen/instance_data_source_gen.go b/stackit/internal/services/postgresflexalpha/instance/datasources_gen/instance_data_source_gen.go index 587d2d89..58f88e01 100644 --- a/stackit/internal/services/postgresflexalpha/instance/datasources_gen/instance_data_source_gen.go +++ b/stackit/internal/services/postgresflexalpha/instance/datasources_gen/instance_data_source_gen.go @@ -115,12 +115,6 @@ func InstanceDataSourceSchema(ctx context.Context) schema.Schema { Description: "Whether the instance can be deleted or not.", MarkdownDescription: "Whether the instance can be deleted or not.", }, - "labels": schema.MapAttribute{ - ElementType: types.StringType, - Computed: true, - Description: "Key-value pairs, 63 characters max, begin and end with an alphanumerical character,\nmay contain dashes (-), underscores (_), dots (.), and alphanumerics between. Key MUST be at least 1 character.\nMax 64 labels\nRegex for keys: ^(?=.{1,63}$)([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]$\nRegex for values: ^(?=.{0,63}$)(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])*$\nThe stackit- prefix is reserved and cannot be used for Keys.\n", - MarkdownDescription: "Key-value pairs, 63 characters max, begin and end with an alphanumerical character,\nmay contain dashes (-), underscores (_), dots (.), and alphanumerics between. Key MUST be at least 1 character.\nMax 64 labels\nRegex for keys: ^(?=.{1,63}$)([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]$\nRegex for values: ^(?=.{0,63}$)(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])*$\nThe stackit- prefix is reserved and cannot be used for Keys.\n", - }, "name": schema.StringAttribute{ Computed: true, Description: "The name of the instance.", @@ -161,7 +155,7 @@ func InstanceDataSourceSchema(ctx context.Context) schema.Schema { MarkdownDescription: "The STACKIT project ID.", }, "region": schema.StringAttribute{ - Optional: true, + Required: true, Description: "The region which should be addressed", MarkdownDescription: "The region which should be addressed", Validators: []validator.String{ @@ -177,8 +171,8 @@ func InstanceDataSourceSchema(ctx context.Context) schema.Schema { }, "retention_days": schema.Int64Attribute{ Computed: true, - Description: "How long backups are retained. The value can only be between 32 and 90 days.", - MarkdownDescription: "How long backups are retained. The value can only be between 32 and 90 days.", + Description: "How long backups are retained. The value can only be between 32 and 365 days.", + MarkdownDescription: "How long backups are retained. The value can only be between 32 and 365 days.", }, "status": schema.StringAttribute{ Computed: true, @@ -225,7 +219,6 @@ type InstanceModel struct { Id types.String `tfsdk:"tf_original_api_id"` InstanceId types.String `tfsdk:"instance_id"` IsDeletable types.Bool `tfsdk:"is_deletable"` - Labels types.Map `tfsdk:"labels"` Name types.String `tfsdk:"name"` Network NetworkValue `tfsdk:"network"` ProjectId types.String `tfsdk:"project_id"` diff --git a/stackit/internal/services/postgresflexalpha/instance/flavor_functions.go b/stackit/internal/services/postgresflexalpha/instance/flavor_functions.go deleted file mode 100644 index a9d86e38..00000000 --- a/stackit/internal/services/postgresflexalpha/instance/flavor_functions.go +++ /dev/null @@ -1,65 +0,0 @@ -package postgresflexalpha - -import ( - "context" - "fmt" - - "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" -) - -type flavorsClientReader interface { - GetFlavorsRequest( - ctx context.Context, - projectId, region string, - ) v3alpha1api.ApiGetFlavorsRequestRequest -} - -func getAllFlavors(ctx context.Context, client flavorsClientReader, projectId, region string) ( - []v3alpha1api.ListFlavors, - error, -) { - getAllFilter := func(_ v3alpha1api.ListFlavors) bool { return true } - flavorList, err := getFlavorsByFilter(ctx, client, projectId, region, getAllFilter) - if err != nil { - return nil, err - } - return flavorList, nil -} - -// getFlavorsByFilter is a helper function to retrieve flavors using a filtern function. -// Hint: The API does not have a GetFlavors endpoint, only ListFlavors -func getFlavorsByFilter( - ctx context.Context, - client flavorsClientReader, - projectId, region string, - filter func(db v3alpha1api.ListFlavors) bool, -) ([]v3alpha1api.ListFlavors, error) { - if projectId == "" || region == "" { - return nil, fmt.Errorf("listing postgresflex flavors: projectId and region are required") - } - - const pageSize = 25 - - var result = make([]v3alpha1api.ListFlavors, 0) - - for page := int32(1); ; page++ { - res, err := client.GetFlavorsRequest(ctx, projectId, region). - Page(page).Size(pageSize).Sort(v3alpha1api.FLAVORSORT_ID_ASC).Execute() - if err != nil { - return nil, fmt.Errorf("requesting flavors list (page %d): %w", page, err) - } - - // If the API returns no flavors, we have reached the end of the list. - if len(res.Flavors) == 0 { - break - } - - for _, flavor := range res.Flavors { - if filter(flavor) { - result = append(result, flavor) - } - } - } - - return result, nil -} diff --git a/stackit/internal/services/postgresflexalpha/instance/flavor_functions_test.go b/stackit/internal/services/postgresflexalpha/instance/flavor_functions_test.go deleted file mode 100644 index 6fbd8c2f..00000000 --- a/stackit/internal/services/postgresflexalpha/instance/flavor_functions_test.go +++ /dev/null @@ -1,135 +0,0 @@ -package postgresflexalpha - -/* -import ( - "context" - "testing" - - postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" -) - -type mockRequest struct { - executeFunc func() (*postgresflex.GetFlavorsResponse, error) -} - -func (m *mockRequest) Page(_ int32) postgresflex.ApiGetFlavorsRequestRequest { return m } -func (m *mockRequest) Size(_ int32) postgresflex.ApiGetFlavorsRequestRequest { return m } -func (m *mockRequest) Sort(_ postgresflex.FlavorSort) postgresflex.ApiGetFlavorsRequestRequest { - return m -} -func (m *mockRequest) Execute() (*postgresflex.GetFlavorsResponse, error) { - return m.executeFunc() -} - -type mockFlavorsClient struct { - executeRequest func() postgresflex.ApiGetFlavorsRequestRequest -} - -func (m *mockFlavorsClient) GetFlavorsRequest(_ context.Context, _, _ string) postgresflex.ApiGetFlavorsRequestRequest { - return m.executeRequest() -} - -var mockResp = func(page int32) (*postgresflex.GetFlavorsResponse, error) { - if page == 1 { - return &postgresflex.GetFlavorsResponse{ - Flavors: []postgresflex.ListFlavors{ - {Id: "flavor-1", Description: "first"}, - {Id: "flavor-2", Description: "second"}, - }, - }, nil - } - if page == 2 { - return &postgresflex.GetFlavorsResponse{ - Flavors: []postgresflex.ListFlavors{ - {Id: "flavor-3", Description: "three"}, - }, - }, nil - } - - return &postgresflex.GetFlavorsResponse{ - Flavors: []postgresflex.ListFlavors{}, - }, nil -} - -func TestGetFlavorsByFilter(t *testing.T) { - tests := []struct { - description string - projectId string - region string - mockErr error - filter func(postgresflex.ListFlavors) bool - wantCount int - wantErr bool - }{ - { - description: "Success - Get all flavors (2 pages)", - projectId: "pid", region: "reg", - filter: func(_ postgresflex.ListFlavors) bool { return true }, - wantCount: 3, - wantErr: false, - }, - { - description: "Success - Filter flavors by description", - projectId: "pid", region: "reg", - filter: func(f postgresflex.ListFlavors) bool { return f.Description == "first" }, - wantCount: 1, - wantErr: false, - }, - { - description: "Error - Missing parameters", - projectId: "", region: "reg", - wantErr: true, - }, - } - - for _, tt := range tests { - t.Run( - tt.description, func(t *testing.T) { - var currentPage int32 - client := &mockFlavorsClient{ - executeRequest: func() postgresflex.ApiGetFlavorsRequestRequest { - return mockRequest{ - executeFunc: func() (*postgresflex.GetFlavorsResponse, error) { - currentPage++ - return mockResp(currentPage) - }, - } - }, - } - actual, err := getFlavorsByFilter(context.Background(), client, tt.projectId, tt.region, tt.filter) - - if (err != nil) != tt.wantErr { - t.Errorf("getFlavorsByFilter() error = %v, wantErr %v", err, tt.wantErr) - return - } - - if !tt.wantErr && len(actual) != tt.wantCount { - t.Errorf("getFlavorsByFilter() got %d flavors, want %d", len(actual), tt.wantCount) - } - }, - ) - } -} - -func TestGetAllFlavors(t *testing.T) { - var currentPage int32 - client := &mockFlavorsClient{ - executeRequest: func() postgresflex.ApiGetFlavorsRequestRequest { - return mockRequest{ - executeFunc: func() (*postgresflex.GetFlavorsResponse, error) { - currentPage++ - return mockResp(currentPage) - }, - } - }, - } - - res, err := getAllFlavors(context.Background(), client, "pid", "reg") - if err != nil { - t.Errorf("getAllFlavors() unexpected error: %v", err) - } - if len(res) != 3 { - t.Errorf("getAllFlavors() expected 3 flavor, got %d", len(res)) - } -} -*/ diff --git a/stackit/internal/services/postgresflexalpha/instance/functions.go b/stackit/internal/services/postgresflexalpha/instance/functions.go index ad67ba3d..6e7164b9 100644 --- a/stackit/internal/services/postgresflexalpha/instance/functions.go +++ b/stackit/internal/services/postgresflexalpha/instance/functions.go @@ -16,7 +16,7 @@ import ( func mapGetInstanceResponseToModel( ctx context.Context, - m *LocalInstanceModel, + m *postgresflexalpharesource.InstanceModel, resp *postgresflex.GetInstanceResponse, ) error { m.BackupSchedule = types.StringValue(resp.GetBackupSchedule()) @@ -55,23 +55,23 @@ func mapGetInstanceResponseToModel( } m.FlavorId = types.StringValue(resp.GetFlavorId()) - m.Id = utils.BuildInternalTerraformId( - m.ProjectId.ValueString(), - m.Region.ValueString(), - resp.Id, - ) + if m.Id.IsNull() || m.Id.IsUnknown() { + m.Id = utils.BuildInternalTerraformId( + m.ProjectId.ValueString(), + m.Region.ValueString(), + m.InstanceId.ValueString(), + ) + } m.InstanceId = types.StringValue(resp.Id) m.IsDeletable = types.BoolValue(resp.GetIsDeletable()) - netACL, diags := types.ListValueFrom(ctx, types.StringType, resp.Network.GetAcl()) + netAcl, diags := types.ListValueFrom(ctx, types.StringType, resp.Network.GetAcl()) if diags.HasError() { return fmt.Errorf("failed converting network acl from response") } - m.Acl = netACL - - // m.Labels = resp.GetLabels() + m.Acl = netAcl netInstAdd := types.StringValue("") if instAdd, ok := resp.Network.GetInstanceAddressOk(); ok { @@ -87,7 +87,7 @@ func mapGetInstanceResponseToModel( postgresflexalpharesource.NetworkValue{}.AttributeTypes(ctx), map[string]attr.Value{ "access_scope": basetypes.NewStringValue(string(resp.Network.GetAccessScope())), - "acl": netACL, + "acl": netAcl, "instance_address": netInstAdd, "router_address": netRtrAdd, }, @@ -130,8 +130,7 @@ func mapGetDataInstanceResponseToModel( handleConnectionInfo(ctx, m, resp) m.FlavorId = types.StringValue(resp.GetFlavorId()) - m.Id = types.StringValue(resp.Id) - m.TerraformID = utils.BuildInternalTerraformId(m.ProjectId.ValueString(), m.Region.ValueString(), m.InstanceId.ValueString()) + m.Id = utils.BuildInternalTerraformId(m.ProjectId.ValueString(), m.Region.ValueString(), m.InstanceId.ValueString()) m.InstanceId = types.StringValue(resp.Id) m.IsDeletable = types.BoolValue(resp.GetIsDeletable()) m.Name = types.StringValue(resp.GetName()) @@ -213,14 +212,14 @@ func handleNetwork(ctx context.Context, m *dataSourceModel, resp *postgresflex.G } func handleEncryption(m *dataSourceModel, resp *postgresflex.GetInstanceResponse) { - keyID := "" - if keyIDVal, ok := resp.Encryption.GetKekKeyIdOk(); ok { - keyID = *keyIDVal + keyId := "" + if keyIdVal, ok := resp.Encryption.GetKekKeyIdOk(); ok { + keyId = *keyIdVal } - keyRingID := "" - if keyRingIDVal, ok := resp.Encryption.GetKekKeyRingIdOk(); ok { - keyRingID = *keyRingIDVal + keyRingId := "" + if keyRingIdVal, ok := resp.Encryption.GetKekKeyRingIdOk(); ok { + keyRingId = *keyRingIdVal } keyVersion := "" @@ -234,8 +233,8 @@ func handleEncryption(m *dataSourceModel, resp *postgresflex.GetInstanceResponse } m.Encryption = postgresflexalphadatasource.EncryptionValue{ - KekKeyId: types.StringValue(keyID), - KekKeyRingId: types.StringValue(keyRingID), + KekKeyId: types.StringValue(keyId), + KekKeyRingId: types.StringValue(keyRingId), KekKeyVersion: types.StringValue(keyVersion), ServiceAccount: types.StringValue(svcAcc), } diff --git a/stackit/internal/services/postgresflexalpha/instance/functions_test.go b/stackit/internal/services/postgresflexalpha/instance/functions_test.go index 1a7d495b..0fa85f16 100644 --- a/stackit/internal/services/postgresflexalpha/instance/functions_test.go +++ b/stackit/internal/services/postgresflexalpha/instance/functions_test.go @@ -8,6 +8,7 @@ import ( postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" + postgresflexalpharesource "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen" utils2 "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils" ) @@ -170,7 +171,7 @@ func Test_mapGetInstanceResponseToModel(t *testing.T) { t.Skipf("please implement") type args struct { ctx context.Context - m *LocalInstanceModel + m *postgresflexalpharesource.InstanceModel resp *postgresflex.GetInstanceResponse } tests := []struct { diff --git a/stackit/internal/services/postgresflexalpha/instance/resource.go b/stackit/internal/services/postgresflexalpha/instance/resource.go index 52742195..d07bf546 100644 --- a/stackit/internal/services/postgresflexalpha/instance/resource.go +++ b/stackit/internal/services/postgresflexalpha/instance/resource.go @@ -7,18 +7,16 @@ import ( "math" "net/http" "strings" - "time" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-plugin-framework/resource/schema" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/identityschema" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" coreUtils "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" + "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core" postgresflexalpha "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen" @@ -34,6 +32,7 @@ var ( _ resource.ResourceWithImportState = &instanceResource{} _ resource.ResourceWithModifyPlan = &instanceResource{} _ resource.ResourceWithValidateConfig = &instanceResource{} + _ resource.ResourceWithIdentity = &instanceResource{} ) // NewInstanceResource is a helper function to simplify the provider implementation. @@ -41,31 +40,27 @@ func NewInstanceResource() resource.Resource { return &instanceResource{} } +// resourceModel describes the resource data model. +type resourceModel = postgresflexalpha.InstanceModel + +type InstanceResourceIdentityModel struct { + ProjectID types.String `tfsdk:"project_id"` + Region types.String `tfsdk:"region"` + InstanceID types.String `tfsdk:"instance_id"` +} + // instanceResource is the resource implementation. type instanceResource struct { client *v3alpha1api.APIClient providerData core.ProviderData } -type LocalInstanceModel struct { - postgresflexalpha.InstanceModel - Flavor types.Object `tfsdk:"flavor"` -} - -// Struct corresponding to Model.Flavor -type flavorModel struct { - Id types.String `tfsdk:"id"` - Description types.String `tfsdk:"description"` - CPU types.Int64 `tfsdk:"cpu"` - RAM types.Int64 `tfsdk:"ram"` -} - func (r *instanceResource) ValidateConfig( ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse, ) { - var data LocalInstanceModel + var data resourceModel resp.Diagnostics.Append(req.Config.Get(ctx, &data)...) if resp.Diagnostics.HasError() { @@ -80,23 +75,6 @@ func (r *instanceResource) ValidateConfig( "The resource may return unexpected results.", ) } - - if data.FlavorId.IsNull() { - if data.Flavor.IsUnknown() || data.Flavor.IsNull() { - resp.Diagnostics.AddAttributeError( - path.Root("flavor"), - "Missing Attribute Configuration", - "Expected flavor to be configured. "+ - "The resource may return unexpected results.", - ) - } - resp.Diagnostics.AddAttributeWarning( - path.Root("flavor"), - "Attribute Configuration Deprecation", - "Using flavor is deprecated, "+ - "please use flavor_id instead.", - ) - } } // ModifyPlan implements resource.ResourceWithModifyPlan. @@ -106,7 +84,7 @@ func (r *instanceResource) ModifyPlan( req resource.ModifyPlanRequest, resp *resource.ModifyPlanResponse, ) { // nolint:gocritic // function signature required by Terraform - var configModel LocalInstanceModel + var configModel resourceModel // skip initial empty configuration to avoid follow-up errors if req.Config.Raw.IsNull() { return @@ -116,7 +94,7 @@ func (r *instanceResource) ModifyPlan( return } - var planModel LocalInstanceModel + var planModel resourceModel resp.Diagnostics.Append(req.Plan.Get(ctx, &planModel)...) if resp.Diagnostics.HasError() { return @@ -166,53 +144,40 @@ func (r *instanceResource) Configure( var modifiersFileByte []byte // Schema defines the schema for the resource. -func (r *instanceResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - schemaVar := postgresflexalpha.InstanceResourceSchema(ctx) - schemaVar.Attributes["flavor"] = schema.SingleNestedAttribute{ - Optional: true, - DeprecationMessage: "Please use flavor_id instead.", - Attributes: map[string]schema.Attribute{ - "id": schema.StringAttribute{ - Computed: true, - PlanModifiers: []planmodifier.String{ - UseStateForUnknownIfFlavorUnchanged(req), - }, - }, - "description": schema.StringAttribute{ - Computed: true, - PlanModifiers: []planmodifier.String{ - UseStateForUnknownIfFlavorUnchanged(req), - }, - }, - "cpu": schema.Int64Attribute{ - DeprecationMessage: "Please use flavor_id instead.", - Optional: true, - }, - "ram": schema.Int64Attribute{ - DeprecationMessage: "Please use flavor_id instead.", - Optional: true, - }, - }, - } - - schemaVar.Attributes["flavor_id"] = schema.StringAttribute{ - Optional: true, - Description: "The id of the instance flavor.", - MarkdownDescription: "The id of the instance flavor.", - } - +func (r *instanceResource) Schema(ctx context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { + schema := postgresflexalpha.InstanceResourceSchema(ctx) fields, err := utils.ReadModifiersConfig(modifiersFileByte) if err != nil { resp.Diagnostics.AddError("error during read modifiers config file", err.Error()) return } - err = utils.AddPlanModifiersToResourceSchema(fields, &schemaVar) + err = utils.AddPlanModifiersToResourceSchema(fields, &schema) if err != nil { resp.Diagnostics.AddError("error adding plan modifiers", err.Error()) return } - resp.Schema = schemaVar + resp.Schema = schema +} + +func (r *instanceResource) IdentitySchema( + _ context.Context, + _ resource.IdentitySchemaRequest, + resp *resource.IdentitySchemaResponse, +) { + resp.IdentitySchema = identityschema.Schema{ + Attributes: map[string]identityschema.Attribute{ + "project_id": identityschema.StringAttribute{ + RequiredForImport: true, // must be set during import by the practitioner + }, + "region": identityschema.StringAttribute{ + RequiredForImport: true, // can be defaulted by the provider configuration + }, + "instance_id": identityschema.StringAttribute{ + RequiredForImport: true, // can be defaulted by the provider configuration + }, + }, + } } // Create creates the resource and sets the initial Terraform state. @@ -221,7 +186,7 @@ func (r *instanceResource) Create( req resource.CreateRequest, resp *resource.CreateResponse, ) { // nolint:gocritic // function signature required by Terraform - var model LocalInstanceModel + var model resourceModel diags := req.Plan.Get(ctx, &model) resp.Diagnostics.Append(diags...) @@ -236,82 +201,15 @@ func (r *instanceResource) Create( ctx = tflog.SetField(ctx, "project_id", projectID) ctx = tflog.SetField(ctx, "region", region) - var netACL []string - diag := model.Network.Acl.ElementsAs(ctx, &netACL, false) + var netAcl []string + diag := model.Network.Acl.ElementsAs(ctx, &netAcl, false) resp.Diagnostics.Append(diags...) if diag.HasError() { return } - // determine flavor ID - var flModel = &flavorModel{} - if !(model.Flavor.IsNull() || model.Flavor.IsUnknown()) { - diags = model.Flavor.As(ctx, flModel, basetypes.ObjectAsOptions{}) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - - flavors, err := getAllFlavors(ctx, r.client.DefaultAPI, projectID, region) - if err != nil { - core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading flavors", fmt.Sprintf("getAllFlavors: %v", err)) - return - } - tflog.Debug(ctx, fmt.Sprintf("loaded flavors: %d", len(flavors))) - - var foundFlavors []v3alpha1api.ListFlavors - for _, flavor := range flavors { - if flModel.CPU.ValueInt64() != int64(flavor.Cpu) { - // tflog.Debug(ctx, fmt.Sprintf("flavor - cpu did not match (%d - %d)", flModel.CPU.ValueInt64(), flavor.Cpu)) - continue - } - if flModel.RAM.ValueInt64() != int64(flavor.Memory) { - // tflog.Debug(ctx, fmt.Sprintf("flavor - ram did not match (%d - %d)", flModel.RAM.ValueInt64(), flavor.Memory)) - continue - } - tmpNodeType := "Single" - if model.Replicas.ValueInt64() > 1 { - tmpNodeType = "Replica" - } - if strings.ToLower(tmpNodeType) != strings.ToLower(flavor.NodeType) { - //tflog.Debug( - // ctx, - // fmt.Sprintf( - // "flavor - nodeType did not match ('%s' - '%s')", - // strings.ToLower(tmpNodeType), - // strings.ToLower(flavor.NodeType), - // ), - //) - continue - } - tflog.Debug(ctx, fmt.Sprintf("found flavor %s, checking storage classes", flavor.Id)) - for _, sc := range flavor.StorageClasses { - if model.Storage.PerformanceClass.ValueString() != sc.Class { - continue - } - tflog.Debug(ctx, fmt.Sprintf("found storage class '%s' for flavor '%s', checking storage classes", sc.Class, flavor.Id)) - foundFlavors = append(foundFlavors, flavor) - } - } - if len(foundFlavors) == 0 { - resp.Diagnostics.AddError("get flavor", "could not find requested flavor") - return - } - if len(foundFlavors) > 1 { - resp.Diagnostics.AddError("get flavor", "found too many matching flavors") - return - } - - f := foundFlavors[0] - flModel.Description = types.StringValue(f.Description) - flModel.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), region, f.Id) - model.FlavorId = types.StringValue(f.Id) - //flModel. .MaxGb = types.Int32Value(f.MaxGB) - //flModel.MinGb = types.Int32Value(f.MinGB) - } - replVal := model.Replicas.ValueInt64() // nolint:gosec // check is performed above - payload := modelToCreateInstancePayload(netACL, model, replVal) + payload := modelToCreateInstancePayload(netAcl, model, replVal) // Create new instance createResp, err := r.client.DefaultAPI.CreateInstanceRequest( @@ -331,18 +229,18 @@ func (r *instanceResource) Create( return } - // Set data returned by API in id - resp.Diagnostics.Append( - resp.State.SetAttribute( - ctx, - path.Root("id"), - utils.BuildInternalTerraformId(projectID, region, *instanceID), - )..., - ) + // Set data returned by API in identity + identity := InstanceResourceIdentityModel{ + ProjectID: types.StringValue(projectID), + Region: types.StringValue(region), + InstanceID: types.StringPointerValue(instanceID), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } waitResp, err := wait.CreateInstanceWaitHandler(ctx, r.client.DefaultAPI, projectID, region, *instanceID). - SetTimeout(90 * time.Minute). - SetSleepBeforeWait(10 * time.Second). WaitWithContext(ctx) if err != nil { core.LogAndAddError( @@ -376,7 +274,7 @@ func (r *instanceResource) Create( func modelToCreateInstancePayload( netACL []string, - model LocalInstanceModel, + model postgresflexalpha.InstanceModel, replVal int64, ) v3alpha1api.CreateInstanceRequestPayload { var enc *v3alpha1api.InstanceEncryption @@ -416,7 +314,7 @@ func (r *instanceResource) Read( ) { // nolint:gocritic // function signature required by Terraform functionErrorSummary := "read instance failed" - var model LocalInstanceModel + var model resourceModel diags := req.State.Get(ctx, &model) resp.Diagnostics.Append(diags...) if resp.Diagnostics.HasError() { @@ -425,9 +323,9 @@ func (r *instanceResource) Read( ctx = core.InitProviderContext(ctx) - var projectID string + var projectId string if !model.ProjectId.IsNull() && !model.ProjectId.IsUnknown() { - projectID = model.ProjectId.ValueString() + projectId = model.ProjectId.ValueString() } var region string @@ -435,16 +333,16 @@ func (r *instanceResource) Read( region = r.providerData.GetRegionWithOverride(model.Region) } - var instanceID string + var instanceId string if !model.InstanceId.IsNull() && !model.InstanceId.IsUnknown() { - instanceID = model.InstanceId.ValueString() + instanceId = model.InstanceId.ValueString() } - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) - instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped if ok && oapiErr.StatusCode == http.StatusNotFound { @@ -463,7 +361,7 @@ func (r *instanceResource) Read( return } if !model.InstanceId.IsUnknown() && !model.InstanceId.IsNull() { - if *respInstanceID != instanceID { + if *respInstanceID != instanceId { core.LogAndAddError( ctx, &resp.Diagnostics, @@ -474,10 +372,6 @@ func (r *instanceResource) Read( } } - if model.Id.IsUnknown() || model.Id.IsNull() { - model.Id = utils.BuildInternalTerraformId(projectID, region, instanceID) - } - err = mapGetInstanceResponseToModel(ctx, &model, instanceResp) if err != nil { core.LogAndAddError( @@ -495,6 +389,17 @@ func (r *instanceResource) Read( return } + // Set data returned by API in identity + identity := InstanceResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + tflog.Info(ctx, "Postgres Flex instance read") } @@ -504,7 +409,7 @@ func (r *instanceResource) Update( req resource.UpdateRequest, resp *resource.UpdateResponse, ) { // nolint:gocritic // function signature required by Terraform - var model LocalInstanceModel + var model resourceModel diags := req.Plan.Get(ctx, &model) resp.Diagnostics.Append(diags...) @@ -514,8 +419,15 @@ func (r *instanceResource) Update( ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() - instanceID := model.InstanceId.ValueString() + // Read identity data + var identityData InstanceResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } + + projectID := identityData.ProjectID.ValueString() + instanceID := identityData.InstanceID.ValueString() region := model.Region.ValueString() ctx = tflog.SetField(ctx, "project_id", projectID) ctx = tflog.SetField(ctx, "instance_id", instanceID) @@ -578,10 +490,7 @@ func (r *instanceResource) Update( projectID, region, instanceID, - ). - SetTimeout(90 * time.Minute). - SetSleepBeforeWait(10 * time.Second). - WaitWithContext(ctx) + ).WaitWithContext(ctx) if err != nil { core.LogAndAddError( ctx, @@ -617,7 +526,7 @@ func (r *instanceResource) Delete( req resource.DeleteRequest, resp *resource.DeleteResponse, ) { // nolint:gocritic // function signature required by Terraform - var model LocalInstanceModel + var model resourceModel diags := req.State.Get(ctx, &model) resp.Diagnostics.Append(diags...) @@ -627,15 +536,15 @@ func (r *instanceResource) Delete( ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() - instanceID := model.InstanceId.ValueString() + projectId := model.ProjectId.ValueString() + instanceId := model.InstanceId.ValueString() region := model.Region.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) // Delete existing instance - err := r.client.DefaultAPI.DeleteInstanceRequest(ctx, projectID, region, instanceID).Execute() + err := r.client.DefaultAPI.DeleteInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting instance", fmt.Sprintf("Calling API: %v", err)) return @@ -643,7 +552,7 @@ func (r *instanceResource) Delete( ctx = core.LogResponse(ctx) - _, err = r.client.DefaultAPI.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + _, err = r.client.DefaultAPI.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped if ok && oapiErr.StatusCode != http.StatusNotFound { @@ -665,30 +574,41 @@ func (r *instanceResource) ImportState( ) { ctx = core.InitProviderContext(ctx) - idParts := strings.Split(req.ID, core.Separator) + if req.ID != "" { + idParts := strings.Split(req.ID, core.Separator) - if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" { - core.LogAndAddError( - ctx, &resp.Diagnostics, - "Error importing instance", - fmt.Sprintf( - "Expected import identifier with format [project_id],[region],[instance_id] Got: %q", - req.ID, - ), - ) + if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" { + core.LogAndAddError( + ctx, &resp.Diagnostics, + "Error importing instance", + fmt.Sprintf( + "Expected import identifier with format [project_id],[region],[instance_id] Got: %q", + req.ID, + ), + ) + return + } + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) return } - resp.Diagnostics.Append( - resp.State.SetAttribute( - ctx, - path.Root("id"), - utils.BuildInternalTerraformId(idParts...), - )..., - ) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) + // If no ID is provided, attempt to read identity attributes from the import configuration + var identityData InstanceResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } + + projectId := identityData.ProjectID.ValueString() + region := identityData.Region.ValueString() + instanceId := identityData.InstanceID.ValueString() + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), projectId)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), region)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), instanceId)...) tflog.Info(ctx, "Postgres Flex instance state imported") } diff --git a/stackit/internal/services/postgresflexalpha/instance/resources_gen/instance_resource_gen.go b/stackit/internal/services/postgresflexalpha/instance/resources_gen/instance_resource_gen.go index 7483dd67..7d7969a6 100644 --- a/stackit/internal/services/postgresflexalpha/instance/resources_gen/instance_resource_gen.go +++ b/stackit/internal/services/postgresflexalpha/instance/resources_gen/instance_resource_gen.go @@ -119,13 +119,6 @@ func InstanceResourceSchema(ctx context.Context) schema.Schema { Description: "Whether the instance can be deleted or not.", MarkdownDescription: "Whether the instance can be deleted or not.", }, - //"labels": schema.MapAttribute{ - // ElementType: types.StringType, - // Optional: true, - // Computed: true, - // Description: "Key-value pairs, 63 characters max, begin and end with an alphanumerical character,\nmay contain dashes (-), underscores (_), dots (.), and alphanumerics between. Key MUST be at least 1 character.\nMax 64 labels\nRegex for keys: ^(?=.{1,63}$)([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]$\nRegex for values: ^(?=.{0,63}$)(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])*$\nThe stackit- prefix is reserved and cannot be used for Keys.\n", - // MarkdownDescription: "Key-value pairs, 63 characters max, begin and end with an alphanumerical character,\nmay contain dashes (-), underscores (_), dots (.), and alphanumerics between. Key MUST be at least 1 character.\nMax 64 labels\nRegex for keys: ^(?=.{1,63}$)([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]$\nRegex for values: ^(?=.{0,63}$)(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])*$\nThe stackit- prefix is reserved and cannot be used for Keys.\n", - //}, "name": schema.StringAttribute{ Required: true, Description: "The name of the instance.", @@ -198,8 +191,8 @@ func InstanceResourceSchema(ctx context.Context) schema.Schema { }, "retention_days": schema.Int64Attribute{ Required: true, - Description: "How long backups are retained. The value can only be between 32 and 90 days.", - MarkdownDescription: "How long backups are retained. The value can only be between 32 and 90 days.", + Description: "How long backups are retained. The value can only be between 32 and 365 days.", + MarkdownDescription: "How long backups are retained. The value can only be between 32 and 365 days.", }, "status": schema.StringAttribute{ Computed: true, @@ -246,16 +239,15 @@ type InstanceModel struct { Id types.String `tfsdk:"id"` InstanceId types.String `tfsdk:"instance_id"` IsDeletable types.Bool `tfsdk:"is_deletable"` - //Labels types.Map `tfsdk:"labels"` - Name types.String `tfsdk:"name"` - Network NetworkValue `tfsdk:"network"` - ProjectId types.String `tfsdk:"project_id"` - Region types.String `tfsdk:"region"` - Replicas types.Int64 `tfsdk:"replicas"` - RetentionDays types.Int64 `tfsdk:"retention_days"` - Status types.String `tfsdk:"status"` - Storage StorageValue `tfsdk:"storage"` - Version types.String `tfsdk:"version"` + Name types.String `tfsdk:"name"` + Network NetworkValue `tfsdk:"network"` + ProjectId types.String `tfsdk:"project_id"` + Region types.String `tfsdk:"region"` + Replicas types.Int64 `tfsdk:"replicas"` + RetentionDays types.Int64 `tfsdk:"retention_days"` + Status types.String `tfsdk:"status"` + Storage StorageValue `tfsdk:"storage"` + Version types.String `tfsdk:"version"` } var _ basetypes.ObjectTypable = ConnectionInfoType{} diff --git a/stackit/internal/services/postgresflexalpha/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go b/stackit/internal/services/postgresflexalpha/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go deleted file mode 100644 index a6dfc1d3..00000000 --- a/stackit/internal/services/postgresflexalpha/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go +++ /dev/null @@ -1,85 +0,0 @@ -package postgresflexalpha - -import ( - "context" - - "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" -) - -type useStateForUnknownIfFlavorUnchangedModifier struct { - Req resource.SchemaRequest -} - -// UseStateForUnknownIfFlavorUnchanged returns a plan modifier similar to UseStateForUnknown -// if the RAM and CPU values are not changed in the plan. Otherwise, the plan modifier does nothing. -func UseStateForUnknownIfFlavorUnchanged(req resource.SchemaRequest) planmodifier.String { - return useStateForUnknownIfFlavorUnchangedModifier{ - Req: req, - } -} - -func (m useStateForUnknownIfFlavorUnchangedModifier) Description(context.Context) string { - return "UseStateForUnknownIfFlavorUnchanged returns a plan modifier similar to UseStateForUnknown if the RAM and CPU values are not changed in the plan. Otherwise, the plan modifier does nothing." -} - -func (m useStateForUnknownIfFlavorUnchangedModifier) MarkdownDescription(ctx context.Context) string { - return m.Description(ctx) -} - -func (m useStateForUnknownIfFlavorUnchangedModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) { // nolint:gocritic // function signature required by Terraform - // Do nothing if there is no state value. - if req.StateValue.IsNull() { - return - } - - // Do nothing if there is a known planned value. - if !req.PlanValue.IsUnknown() { - return - } - - // Do nothing if there is an unknown configuration value, otherwise interpolation gets messed up. - if req.ConfigValue.IsUnknown() { - return - } - - // The above checks are taken from the UseStateForUnknown plan modifier implementation - // (https://github.com/hashicorp/terraform-plugin-framework/blob/main/resource/schema/stringplanmodifier/use_state_for_unknown.go#L38) - - var stateModel LocalInstanceModel - diags := req.State.Get(ctx, &stateModel) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - - var stateFlavor = &flavorModel{} - if !(stateModel.Flavor.IsNull() || stateModel.Flavor.IsUnknown()) { - diags = stateModel.Flavor.As(ctx, stateFlavor, basetypes.ObjectAsOptions{}) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - } - - var planModel LocalInstanceModel - diags = req.Plan.Get(ctx, &planModel) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - - var planFlavor = &flavorModel{} - if !(planModel.Flavor.IsNull() || planModel.Flavor.IsUnknown()) { - diags = planModel.Flavor.As(ctx, planFlavor, basetypes.ObjectAsOptions{}) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - } - - if planFlavor.CPU == stateFlavor.CPU && planFlavor.RAM == stateFlavor.RAM { - resp.PlanValue = req.StateValue - } -} diff --git a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go index 6c057cfb..b5707376 100644 --- a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go @@ -7,20 +7,14 @@ import ( "log" "math" "os" - "regexp" "strconv" "strings" "testing" "time" - "github.com/hashicorp/terraform-plugin-testing/compare" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/knownvalue" - "github.com/hashicorp/terraform-plugin-testing/plancheck" - "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" @@ -36,13 +30,7 @@ import ( fwresource "github.com/hashicorp/terraform-plugin-framework/resource" ) -const ( - pfx = "stackitprivatepreview_postgresflexalpha" - dataPfx = "data.stackitprivatepreview_postgresflexalpha" - - singleFlavorID = "2.4" - replicasFlavorID = "2.4-replica" -) +const pfx = "stackitprivatepreview_postgresflexalpha" func TestInstanceResourceSchema(t *testing.T) { // t.Parallel() @@ -95,13 +83,12 @@ type resData struct { PerformanceClass string Replicas uint32 Size uint32 - ACLStrings []string + ACLString string AccessScope string RetentionDays uint32 Version string Users []User Databases []Database - DataSourceTest bool } type User struct { @@ -124,14 +111,14 @@ func getExample() resData { ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), Name: name, TfName: name, - FlavorID: singleFlavorID, + FlavorID: "2.4", BackupSchedule: "0 0 * * *", UseEncryption: false, RetentionDays: 33, Replicas: 1, PerformanceClass: "premium-perf2-stackit", Size: 10, - ACLStrings: []string{"0.0.0.0/0"}, + ACLString: "0.0.0.0/0", AccessScope: "PUBLIC", Version: "17", } @@ -139,7 +126,6 @@ func getExample() resData { func TestAccInstance(t *testing.T) { exData := getExample() - exData.Version = "16" updNameData := exData updNameData.Name = "name-updated" @@ -151,238 +137,149 @@ func TestAccInstance(t *testing.T) { // api should complain about more than one daily backup updBackupSched.BackupSchedule = "30 3 * * *" - updNetACL := updBackupSched - updNetACL.ACLStrings = append(updNetACL.ACLStrings, "192.168.0.0/24") - - updVersion := updNetACL - updVersion.Version = "17" + /* + { + "backupSchedule": "6 6 * * *", + "flavorId": "1.2", + "name": "postgres-instance", + "network": { + "acl": [ + "198.51.100.0/24" + ] + }, + "replicas": 1, + "retentionDays": 35, + "storage": { + "size": 10 + }, + "version": "string" + } + */ testItemID := testutils.ResStr(pfx, "instance", exData.TfName) - compareValuesSame := statecheck.CompareValue(compare.ValuesSame()) + resource.ParallelTest( t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), exData.TfName) + t.Logf(" ... working on instance %s", exData.TfName) }, CheckDestroy: testAccCheckPostgresFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "create and verify") - }, + //PreConfig: func() { + // // + // }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", exData, ), - ConfigStateChecks: []statecheck.StateCheck{ - compareValuesSame.AddStateValue( - testItemID, - tfjsonpath.New("id"), - ), - statecheck.ExpectKnownValue( - testItemID, - tfjsonpath.New("is_deletable"), - knownvalue.Bool(true), - ), - statecheck.ExpectKnownValue( - testItemID, - tfjsonpath.New("connection_info"), - knownvalue.MapExact(map[string]knownvalue.Check{ - "write": knownvalue.MapExact(map[string]knownvalue.Check{ - "host": knownvalue.StringRegexp(regexp.MustCompile("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}.postgresql.[a-z0-9]+.onstackit.cloud")), - "port": knownvalue.Int32Func(func(v int32) error { - if v < 0 { - return fmt.Errorf("value is negative") - } - if v <= 1024 { - return fmt.Errorf("value uses protected port range") - } - return nil - }), - }), - }), - ), - }, - Check: defaultNoEncInstanceTestChecks(testItemID, exData), - }, - // Second apply should not have changes - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "second apply") - }, - Config: testutils.StringFromTemplateMust( - "testdata/instance_template.gompl", - exData, + Check: resource.ComposeAggregateTestCheckFunc( + // check params acl count + resource.TestCheckResourceAttr(testItemID, "acl.#", "1"), + + // check params are set + resource.TestCheckResourceAttrSet(testItemID, "backup_schedule"), + + //// connection_info should contain 1 sub entry + // resource.TestCheckResourceAttr(testItemID, "connection_info.%", "1"), + // + //// connection_info.write should contain 2 sub entries + // resource.TestCheckResourceAttr(testItemID, "connection_info.write", "2"), + // + // resource.TestCheckResourceAttrSet(testItemID, "connection_info.write.host"), + // resource.TestCheckResourceAttrSet(testItemID, "connection_info.write.port"), + + resource.TestCheckResourceAttrSet(testItemID, "flavor_id"), + resource.TestCheckResourceAttrSet(testItemID, "id"), + resource.TestCheckResourceAttrSet(testItemID, "instance_id"), + resource.TestCheckResourceAttrSet(testItemID, "is_deletable"), + resource.TestCheckResourceAttrSet(testItemID, "name"), + + // network should contain 4 sub entries + resource.TestCheckResourceAttr(testItemID, "network.%", "4"), + + resource.TestCheckResourceAttrSet(testItemID, "network.access_scope"), + + // on unencrypted instances we expect this to be empty + resource.TestCheckResourceAttr(testItemID, "network.instance_address", ""), + resource.TestCheckResourceAttr(testItemID, "network.router_address", ""), + + // only one acl entry should be set + resource.TestCheckResourceAttr(testItemID, "network.acl.#", "1"), + + resource.TestCheckResourceAttrSet(testItemID, "replicas"), + resource.TestCheckResourceAttrSet(testItemID, "retention_days"), + resource.TestCheckResourceAttrSet(testItemID, "status"), + + // storage should contain 2 sub entries + resource.TestCheckResourceAttr(testItemID, "storage.%", "2"), + + resource.TestCheckResourceAttrSet(testItemID, "storage.performance_class"), + resource.TestCheckResourceAttrSet(testItemID, "storage.size"), + resource.TestCheckResourceAttrSet(testItemID, "version"), + + // check absent attr + resource.TestCheckNoResourceAttr(testItemID, "encryption"), + resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_id"), + resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_ring_id"), + resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_version"), + resource.TestCheckNoResourceAttr(testItemID, "encryption.service_account"), + + // check param values + resource.TestCheckResourceAttr(testItemID, "name", exData.Name), ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectEmptyPlan(), - }, - }, - ConfigStateChecks: []statecheck.StateCheck{ - compareValuesSame.AddStateValue( - testItemID, - tfjsonpath.New("id"), - ), - statecheck.ExpectKnownValue( - testItemID, - tfjsonpath.New("is_deletable"), - knownvalue.Bool(true), - ), - }, - }, - // Refresh state test - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "refresh state") - }, - RefreshState: true, }, // Update name and verify { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "update name") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", updNameData, ), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - testItemID, + testutils.ResStr(pfx, "instance", exData.TfName), "name", updNameData.Name, ), ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectNonEmptyPlan(), - }, - }, }, // Update size and verify { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "update storage.size") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", updSizeData, ), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - testItemID, + testutils.ResStr(pfx, "instance", exData.TfName), "storage.size", strconv.Itoa(int(updSizeData.Size)), ), - // network should contain 4 sub entries - resource.TestCheckResourceAttr(testItemID, "network.acl.#", "1"), ), }, // Update backup schedule { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "update backup schedule") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", updBackupSched, ), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - testItemID, + testutils.ResStr(pfx, "instance", exData.TfName), "backup_schedule", updBackupSched.BackupSchedule, ), - // network should contain 4 sub entries - resource.TestCheckResourceAttr(testItemID, "network.acl.#", "1"), ), }, - // Update network ACL - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "update network.acl") - }, - Config: testutils.StringFromTemplateMust( - "testdata/instance_template.gompl", - updNetACL, - ), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - testItemID, - "backup_schedule", - updBackupSched.BackupSchedule, - ), - // network should contain 4 sub entries - resource.TestCheckResourceAttr(testItemID, "network.acl.#", "2"), - ), - }, - // Update version - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "update version") - }, - Config: testutils.StringFromTemplateMust( - "testdata/instance_template.gompl", - updVersion, - ), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - testItemID, - "version", - updVersion.Version, - ), - ), - }, - // Import test - // test instance imports - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "import instance") - }, - ResourceName: testItemID, - // ImportStateIdPrefix: "", - // ImportStateVerifyIdentifierAttribute: "id", - ImportStateIdFunc: getInstanceTestID(exData.TfName), - ImportStateKind: resource.ImportCommandWithID, - ImportState: true, - ImportStateVerify: true, - }, - }, - }, - ) -} - -func TestAccInstanceHA(t *testing.T) { - data := getExample() - data.FlavorID = replicasFlavorID - data.Replicas = 3 - - testItemID := testutils.ResStr(pfx, "instance", data.TfName) - - resource.ParallelTest( - t, resource.TestCase{ - PreCheck: func() { - testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), data.TfName) - }, - CheckDestroy: testAccCheckPostgresFlexDestroy, - ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, - Steps: []resource.TestStep{ - // Create and verify - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "create and verify") - }, - Config: testutils.StringFromTemplateMust( - "testdata/instance_template.gompl", - data, - ), - Check: defaultNoEncInstanceTestChecks(testItemID, data), - }, + //// Import test + //{ + // ResourceName: "example_resource.test", + // ImportState: true, + // ImportStateVerify: true, + // }, }, }, ) @@ -400,34 +297,30 @@ func TestAccInstanceWithUsers(t *testing.T) { }, } - testItemID := testutils.ResStr(pfx, "instance", data.TfName) - // TODO : implement check multiple users - testUserItemID := testutils.ResStr(pfx, "user", userName) - resource.ParallelTest( t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), data.TfName) + t.Logf(" ... working on instance %s", data.TfName) }, CheckDestroy: testAccCheckPostgresFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "create and verify") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", data, ), Check: resource.ComposeAggregateTestCheckFunc( - defaultNoEncInstanceTestChecks(testItemID, data), - - resource.TestCheckResourceAttr(testUserItemID, "name", userName), - resource.TestCheckResourceAttrSet(testUserItemID, "id"), - resource.TestCheckResourceAttr(testUserItemID, "roles.#", "1"), + resource.TestCheckResourceAttr( + testutils.ResStr(pfx, "instance", data.TfName), + "name", + data.Name, + ), + resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "instance", data.TfName), "id"), + resource.TestCheckResourceAttr(testutils.ResStr(pfx, "user", userName), "name", userName), + resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "user", userName), "id"), ), }, }, @@ -455,185 +348,36 @@ func TestAccInstanceWithDatabases(t *testing.T) { Owner: userName, }, } - data.DataSourceTest = true - testItemID := testutils.ResStr(pfx, "instance", data.TfName) resource.ParallelTest( t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), data.TfName) + t.Logf(" ... working on instance %s", data.TfName) }, CheckDestroy: testAccCheckPostgresFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "create and verify") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", data, ), Check: resource.ComposeAggregateTestCheckFunc( - defaultNoEncInstanceTestChecks(testItemID, data), - - // TODO - extract also to functions - resource.TestCheckResourceAttr(testutils.ResStr(pfx, "user", userName), "name", userName), - resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "user", userName), "id"), - resource.TestCheckResourceAttrPair( - testItemID, "project_id", - testutils.ResStr(pfx, "user", userName), "project_id", - ), - resource.TestCheckResourceAttrPair( - testItemID, "instance_id", - testutils.ResStr(pfx, "user", userName), "instance_id", - ), - - // TODO - extract also to functions - resource.TestCheckResourceAttr(testutils.ResStr(pfx, "database", dbName), "name", dbName), - resource.TestCheckResourceAttr(testutils.ResStr(pfx, "database", dbName), "owner", userName), - resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "database", dbName), "id"), - resource.TestCheckResourceAttrPair( - testItemID, "project_id", - testutils.ResStr(pfx, "database", dbName), "project_id", - ), - resource.TestCheckResourceAttrPair( - testItemID, "instance_id", - testutils.ResStr(pfx, "database", dbName), "instance_id", - ), - ), - }, - // data source - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "datasource") - }, - Config: testutils.StringFromTemplateMust( - "testdata/instance_template.gompl", - data, - ), - Check: resource.ComposeAggregateTestCheckFunc( - // Instance data resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "instance", data.TfName), - "project_id", - data.ProjectID, - ), - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "instance", data.TfName), + testutils.ResStr(pfx, "instance", data.TfName), "name", data.Name, ), - resource.TestCheckResourceAttrPair( - testutils.ResStr(dataPfx, "instance", data.TfName), "project_id", - testutils.ResStr(pfx, "instance", data.TfName), "project_id", - ), - resource.TestCheckResourceAttrPair( - testutils.ResStr(dataPfx, "database", dbName), "instance_id", - testutils.ResStr(pfx, "instance", data.TfName), "instance_id", - ), - resource.TestCheckResourceAttrPair( - testutils.ResStr(dataPfx, "user", userName), "instance_id", - testutils.ResStr(pfx, "instance", data.TfName), "instance_id", - ), - resource.TestCheckResourceAttrPair( - testutils.ResStr(dataPfx, "user", userName), "instance_id", - testutils.ResStr(pfx, "user", userName), "instance_id", - ), - - // User data - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "user", userName), - "project_id", - data.ProjectID, - ), - resource.TestCheckResourceAttrSet( - testutils.ResStr(dataPfx, "user", userName), - "user_id", - ), - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "user", userName), - "name", - data.Users[0].Name, - ), - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "user", userName), - "roles.#", - "1", - ), - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "user", userName), - "roles.0", - data.Users[0].Roles[0], - ), - - // Database data - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "database", dbName), - "project_id", - data.ProjectID, - ), - resource.TestCheckResourceAttr( - testutils.ResStr(dataPfx, "database", dbName), - "name", - dbName, - ), - resource.TestCheckResourceAttrPair( - testutils.ResStr(dataPfx, "database", dbName), - "instance_id", - testutils.ResStr(pfx, "database", dbName), - "instance_id", - ), - resource.TestCheckResourceAttrPair( - testutils.ResStr(dataPfx, "database", dbName), - "owner", - testutils.ResStr(dataPfx, "user", userName), - "name", - ), + resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "instance", data.TfName), "id"), + resource.TestCheckResourceAttr(testutils.ResStr(pfx, "user", userName), "name", userName), + resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "user", userName), "id"), + resource.TestCheckResourceAttr(testutils.ResStr(pfx, "database", dbName), "name", dbName), + resource.TestCheckResourceAttr(testutils.ResStr(pfx, "database", dbName), "owner", userName), + resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "database", dbName), "id"), ), }, - // test instance imports - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "import instance") - }, - ResourceName: testItemID, - // ImportStateIdPrefix: "", - ImportStateVerifyIdentifierAttribute: "id", - ImportStateIdFunc: getInstanceTestID(data.TfName), - ImportStateKind: resource.ImportCommandWithID, - ImportState: true, - ImportStateVerify: true, - }, - // test database imports - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "import database") - }, - ResourceName: testutils.ResStr(pfx, "database", dbName), - // ImportStateIdPrefix: "", - // ImportStateVerifyIdentifierAttribute: "id", - ImportStateIdFunc: getDatabaseTestID(dbName), - ImportStateKind: resource.ImportCommandWithID, - ImportState: true, - ImportStateVerify: true, - }, - // test user imports - { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "import user") - }, - ResourceName: testutils.ResStr(pfx, "user", userName), - // ImportStateIdPrefix: "", - // ImportStateVerifyIdentifierAttribute: "id", - ImportStateIdFunc: getUserTestID(userName), - ImportStateKind: resource.ImportCommandWithID, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"password"}, - }, }, }, ) @@ -692,28 +436,28 @@ func TestAccEncryptedInstanceWithDatabases(t *testing.T) { }, } - testItemID := testutils.ResStr(pfx, "instance", data.TfName) resource.ParallelTest( t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), data.TfName) + t.Logf(" ... working on instance %s", data.TfName) }, CheckDestroy: testAccCheckPostgresFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - t.Logf(" ... %s - %s", t.Name(), "create and verify") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", data, ), Check: resource.ComposeAggregateTestCheckFunc( - defaultEncInstanceTestChecks(testItemID, data), - + resource.TestCheckResourceAttr( + testutils.ResStr(pfx, "instance", data.TfName), + "name", + data.Name, + ), + resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "instance", data.TfName), "id"), resource.TestCheckResourceAttr(testutils.ResStr(pfx, "user", userName), "name", userName), resource.TestCheckResourceAttrSet(testutils.ResStr(pfx, "user", userName), "id"), resource.TestCheckResourceAttr(testutils.ResStr(pfx, "database", dbName), "name", dbName), @@ -726,6 +470,659 @@ func TestAccEncryptedInstanceWithDatabases(t *testing.T) { ) } +// func setupMockServer() *httptest.Server { +// mux := http.NewServeMux() +// +// mux.HandleFunc("/api/resources", func(w http.ResponseWriter, r *http.Request) { +// switch r.Method { +// case http.MethodPost: +// w.WriteHeader(http.StatusCreated) +// err := json.NewEncoder(w).Encode(map[string]string{ +// "id": "mock-id-123", +// "name": "test-resource", +// }) +// if err != nil { +// log.Fatalln(err) +// } +// case http.MethodGet: +// w.WriteHeader(http.StatusOK) +// err := json.NewEncoder(w).Encode([]map[string]string{}) +// if err != nil { +// log.Fatalln(err) +// } +// } +// }) +// +// return httptest.NewServer(mux) +//} +// +// func TestUnitResourceCreate(t *testing.T) { +// server := setupMockServer() +// defer server.Close() +// +// // Configure provider to use mock server URL +// err := os.Setenv("API_ENDPOINT", server.URL) +// if err != nil { +// log.Fatalln(err) +// } +// +// // Run unit tests against mock +//} + +// func TestNewInstanceResource(t *testing.T) { +// exData := resData{ +// Region: "eu01", +// ServiceAccountFilePath: sa_file, +// ProjectID: project_id, +// Name: "testRes", +// } +// resource.ParallelTest(t, resource.TestCase{ +// ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, +// Steps: []resource.TestStep{ +// { +// Config: testAccResourceEncryptionExampleConfig(exData), +// Check: resource.ComposeAggregateTestCheckFunc( +// resource.TestCheckResourceAttr("example_resource.test", "name", exData.Name), +// resource.TestCheckResourceAttrSet("example_resource.test", "id"), +// ), +// }, +// }, +// }) +// +// //tests := []struct { +// // name string +// // want resource.Resource +// //}{ +// // { +// // name: "create empty instance resource", +// // want: &instanceResource{}, +// // }, +// //} +// //for _, tt := range tests { +// // t.Run(tt.name, func(t *testing.T) { +// // if got := NewInstanceResource(); !reflect.DeepEqual(got, tt.want) { +// // t.Errorf("NewInstanceResource() = %v, want %v", got, tt.want) +// // } +// // }) +// //} +//} + +//// Instance resource data +// var instanceResource = map[string]string{ +// "project_id": testutils.ProjectId, +// "region": "eu01", +// "name": fmt.Sprintf("tf-acc-%s", acctest.RandStringFromCharSet(7, acctest.CharSetAlphaNum)), +// "acl": "192.168.0.0/16", +// "backup_schedule": "00 16 * * *", +// "backup_schedule_updated": "00 12 * * *", +// "retention_days": "33", +// "flavor_cpu": "2", +// "flavor_ram": "4", +// "flavor_description": "Small, Compute optimized", +// "replicas": "1", +// "storage_class": "premium-perf12-stackit", +// "storage_size": "5", +// "version": "14", +// "flavor_id": "2.4", +// "kek_key_id": "UUID1", +// "kek_key_ring_id": "UUID2", +// "kek_key_version": "1", +// "service_account": "service@account.com", +// "access_scope": "SNA", +//} +// +//// User resource data +// var userResource = map[string]string{ +// "username": fmt.Sprintf("tfaccuser%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlpha)), +// "role": "createdb", +// "project_id": testutils.ProjectId, +//} +// +//// Database resource data +// var databaseResource = map[string]string{ +// "name": fmt.Sprintf("tfaccdb%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlphaNum)), +// "project_id": testutils.ProjectId, +//} +// +// func configResources(backupSchedule string, _ *string) string { +// return fmt.Sprintf( +// ` +// %s +// +// +// resource "stackitprivatepreview_postgresflexalpha_instance" "instance" { +// project_id = "%s" +// region = "%s" +// name = "%s" +// backup_schedule = "%s" +// retention_days = %s +// flavor_id = %s +// replicas = %s +// storage = { +// performance_class = "%s" +// size = %s +// } +// encryption = { +// kek_key_id = "%s" +// kek_key_ring_id = "%s" +// kek_key_version = "%s" +// service_account = "%s" +// } +// network = { +// acl = ["%s"] +// access_scope = "%s" +// } +// version = %s +// } +// +// resource "stackitprivatepreview_postgresflexalpha_user" "user" { +// project_id = "%s" +// instance_id = stackitprivatepreview_postgresflexalpha_instance.instance.instance_id +// username = "%s" +// roles = ["%s"] +// } +// +// resource "stackitprivatepreview_postgresflexalpha_database" "database" { +// project_id = "%s" +// instance_id = stackitprivatepreview_postgresflexalpha_instance.instance.instance_id +// name = "%s" +// owner = stackitprivatepreview_postgresflexalpha_user.user.username +// } +// `, +// testutils.PostgresFlexProviderConfig( +// utils.GetEnvOrDefault("TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_FILE", "~/service-account.json"), +// ), +// instanceResource["project_id"], +// instanceResource["region"], +// instanceResource["name"], +// backupSchedule, +// instanceResource["retention_days"], +// instanceResource["flavor_id"], +// instanceResource["replicas"], +// instanceResource["storage_class"], +// instanceResource["storage_size"], +// instanceResource["kek_key_id"], +// instanceResource["kek_key_ring_id"], +// instanceResource["kek_key_version"], +// instanceResource["service_account"], +// instanceResource["acl"], +// instanceResource["access_scope"], +// instanceResource["version"], +// +// userResource["project_id"], +// userResource["username"], +// userResource["role"], +// +// databaseResource["project_id"], +// databaseResource["name"], +// ) +//} +// +// func TestAccPostgresFlexFlexResource(t *testing.T) { +// resource.ParallelTest( +// t, resource.TestCase{ +// ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, +// CheckDestroy: testAccCheckPostgresFlexDestroy, +// Steps: []resource.TestStep{ +// // Creation +// { +// // testdata/ +// // ConfigDirectory: config.TestNameDirectory(), +// +// // testdata// +// // ConfigDirectory: config.TestStepDirectory(), +// Config: configResources(instanceResource["backup_schedule"], &testutils.Region), +// Check: resource.ComposeAggregateTestCheckFunc( +// // Instance +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "project_id", +// instanceResource["project_id"], +// ), +// resource.TestCheckResourceAttrSet( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "instance_id", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "name", +// instanceResource["name"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "acl.#", +// "1", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "acl.0", +// instanceResource["acl"], +// ), +// resource.TestCheckResourceAttrSet( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.id", +// ), +// resource.TestCheckResourceAttrSet( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.description", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "backup_schedule", +// instanceResource["backup_schedule"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.cpu", +// instanceResource["flavor_cpu"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.ram", +// instanceResource["flavor_ram"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "replicas", +// instanceResource["replicas"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "storage.class", +// instanceResource["storage_class"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "storage.size", +// instanceResource["storage_size"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "version", +// instanceResource["version"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "region", +// testutils.Region, +// ), +// +// // User +// resource.TestCheckResourceAttrPair( +// "stackitprivatepreview_postgresflexalpha_user.user", "project_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", "project_id", +// ), +// resource.TestCheckResourceAttrPair( +// "stackitprivatepreview_postgresflexalpha_user.user", "instance_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", "instance_id", +// ), +// resource.TestCheckResourceAttrSet("stackitprivatepreview_postgresflexalpha_user.user", "user_id"), +// resource.TestCheckResourceAttrSet("stackitprivatepreview_postgresflexalpha_user.user", "password"), +// +// // Database +// resource.TestCheckResourceAttrPair( +// "stackitprivatepreview_postgresflexalpha_database.database", "project_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", "project_id", +// ), +// resource.TestCheckResourceAttrPair( +// "stackitprivatepreview_postgresflexalpha_database.database", "instance_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", "instance_id", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_database.database", +// "name", +// databaseResource["name"], +// ), +// resource.TestCheckResourceAttrPair( +// "stackitprivatepreview_postgresflexalpha_database.database", "owner", +// "stackitprivatepreview_postgresflexalpha_user.user", "username", +// ), +// ), +// }, +// // data source +// { +// Config: fmt.Sprintf( +// ` +// %s +// +// data "stackitprivatepreview_postgresflexalpha_instance" "instance" { +// project_id = stackitprivatepreview_postgresflexalpha_instance.instance.project_id +// instance_id = stackitprivatepreview_postgresflexalpha_instance.instance.instance_id +// } +// +// data "stackitprivatepreview_postgresflexalpha_user" "user" { +// project_id = stackitprivatepreview_postgresflexalpha_instance.instance.project_id +// instance_id = stackitprivatepreview_postgresflexalpha_instance.instance.instance_id +// user_id = stackitprivatepreview_postgresflexalpha_user.user.user_id +// } +// +// data "stackitprivatepreview_postgresflexalpha_database" "database" { +// project_id = stackitprivatepreview_postgresflexalpha_instance.instance.project_id +// instance_id = stackitprivatepreview_postgresflexalpha_instance.instance.instance_id +// database_id = stackitprivatepreview_postgresflexalpha_database.database.database_id +// } +// `, +// configResources(instanceResource["backup_schedule"], nil), +// ), +// Check: resource.ComposeAggregateTestCheckFunc( +// // Instance data +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "project_id", +// instanceResource["project_id"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "name", +// instanceResource["name"], +// ), +// resource.TestCheckResourceAttrPair( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", "project_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", "project_id", +// ), +// resource.TestCheckResourceAttrPair( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", "instance_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", "instance_id", +// ), +// resource.TestCheckResourceAttrPair( +// "data.stackitprivatepreview_postgresflexalpha_user.user", "instance_id", +// "stackitprivatepreview_postgresflexalpha_user.user", "instance_id", +// ), +// +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "acl.#", +// "1", +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "acl.0", +// instanceResource["acl"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "backup_schedule", +// instanceResource["backup_schedule"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.id", +// instanceResource["flavor_id"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.description", +// instanceResource["flavor_description"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.cpu", +// instanceResource["flavor_cpu"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.ram", +// instanceResource["flavor_ram"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_instance.instance", +// "replicas", +// instanceResource["replicas"], +// ), +// +// // User data +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "project_id", +// userResource["project_id"], +// ), +// resource.TestCheckResourceAttrSet( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "user_id", +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "username", +// userResource["username"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "roles.#", +// "1", +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "roles.0", +// userResource["role"], +// ), +// resource.TestCheckResourceAttrSet( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "host", +// ), +// resource.TestCheckResourceAttrSet( +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "port", +// ), +// +// // Database data +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_database.database", +// "project_id", +// instanceResource["project_id"], +// ), +// resource.TestCheckResourceAttr( +// "data.stackitprivatepreview_postgresflexalpha_database.database", +// "name", +// databaseResource["name"], +// ), +// resource.TestCheckResourceAttrPair( +// "data.stackitprivatepreview_postgresflexalpha_database.database", +// "instance_id", +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "instance_id", +// ), +// resource.TestCheckResourceAttrPair( +// "data.stackitprivatepreview_postgresflexalpha_database.database", +// "owner", +// "data.stackitprivatepreview_postgresflexalpha_user.user", +// "username", +// ), +// ), +// }, +// // Import +// { +// ResourceName: "stackitprivatepreview_postgresflexalpha_instance.instance", +// ImportStateIdFunc: func(s *terraform.State) (string, error) { +// r, ok := s.RootModule().Resources["stackitprivatepreview_postgresflexalpha_instance.instance"] +// if !ok { +// return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.instance") +// } +// instanceId, ok := r.Primary.Attributes["instance_id"] +// if !ok { +// return "", fmt.Errorf("couldn't find attribute instance_id") +// } +// +// return fmt.Sprintf("%s,%s,%s", testutils.ProjectId, testutils.Region, instanceId), nil +// }, +// ImportState: true, +// ImportStateVerify: true, +// ImportStateVerifyIgnore: []string{"password"}, +// }, +// { +// ResourceName: "stackitprivatepreview_postgresflexalpha_user.user", +// ImportStateIdFunc: func(s *terraform.State) (string, error) { +// r, ok := s.RootModule().Resources["stackitprivatepreview_postgresflexalpha_user.user"] +// if !ok { +// return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_user.user") +// } +// instanceId, ok := r.Primary.Attributes["instance_id"] +// if !ok { +// return "", fmt.Errorf("couldn't find attribute instance_id") +// } +// userId, ok := r.Primary.Attributes["user_id"] +// if !ok { +// return "", fmt.Errorf("couldn't find attribute user_id") +// } +// +// return fmt.Sprintf("%s,%s,%s,%s", testutils.ProjectId, testutils.Region, instanceId, userId), nil +// }, +// ImportState: true, +// ImportStateVerify: true, +// ImportStateVerifyIgnore: []string{"password", "uri"}, +// }, +// { +// ResourceName: "stackitprivatepreview_postgresflexalpha_database.database", +// ImportStateIdFunc: func(s *terraform.State) (string, error) { +// r, ok := s.RootModule().Resources["stackitprivatepreview_postgresflexalpha_database.database"] +// if !ok { +// return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_database.database") +// } +// instanceId, ok := r.Primary.Attributes["instance_id"] +// if !ok { +// return "", fmt.Errorf("couldn't find attribute instance_id") +// } +// databaseId, ok := r.Primary.Attributes["database_id"] +// if !ok { +// return "", fmt.Errorf("couldn't find attribute database_id") +// } +// +// return fmt.Sprintf( +// "%s,%s,%s,%s", +// testutils.ProjectId, +// testutils.Region, +// instanceId, +// databaseId, +// ), nil +// }, +// ImportState: true, +// ImportStateVerify: true, +// }, +// // Update +// { +// Config: configResources(instanceResource["backup_schedule_updated"], nil), +// Check: resource.ComposeAggregateTestCheckFunc( +// // Instance data +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "project_id", +// instanceResource["project_id"], +// ), +// resource.TestCheckResourceAttrSet( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "instance_id", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "name", +// instanceResource["name"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "acl.#", +// "1", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "acl.0", +// instanceResource["acl"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "backup_schedule", +// instanceResource["backup_schedule_updated"], +// ), +// resource.TestCheckResourceAttrSet( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.id", +// ), +// resource.TestCheckResourceAttrSet( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.description", +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.cpu", +// instanceResource["flavor_cpu"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "flavor.ram", +// instanceResource["flavor_ram"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "replicas", +// instanceResource["replicas"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "storage.class", +// instanceResource["storage_class"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "storage.size", +// instanceResource["storage_size"], +// ), +// resource.TestCheckResourceAttr( +// "stackitprivatepreview_postgresflexalpha_instance.instance", +// "version", +// instanceResource["version"], +// ), +// ), +// }, +// // Deletion is done by the framework implicitly +// }, +// }, +// ) +//} +// +// func testAccCheckPostgresFlexDestroy(s *terraform.State) error { +// ctx := context.Background() +// var client *postgresflex.APIClient +// var err error +// if testutils.PostgresFlexCustomEndpoint == "" { +// client, err = postgresflex.NewAPIClient() +// } else { +// client, err = postgresflex.NewAPIClient( +// config.WithEndpoint(testutils.PostgresFlexCustomEndpoint), +// ) +// } +// if err != nil { +// return fmt.Errorf("creating client: %w", err) +// } +// +// instancesToDestroy := []string{} +// for _, rs := range s.RootModule().Resources { +// if rs.Type != "stackitprivatepreview_postgresflexalpha_instance" { +// continue +// } +// // instance terraform ID: = "[project_id],[region],[instance_id]" +// instanceId := strings.Split(rs.Primary.ID, core.Separator)[2] +// instancesToDestroy = append(instancesToDestroy, instanceId) +// } +// +// instancesResp, err := client.ListInstancesRequest(ctx, testutils.ProjectId, testutils.Region).Execute() +// if err != nil { +// return fmt.Errorf("getting instancesResp: %w", err) +// } +// +// items := *instancesResp.Instances +// for i := range items { +// if items[i].Id == nil { +// continue +// } +// if utils.Contains(instancesToDestroy, *items[i].Id) { +// // TODO @mhenselin - does force still exist? +// err := client.DeleteInstanceRequestExecute(ctx, testutils.ProjectId, testutils.Region, *items[i].Id) +// if err != nil { +// return fmt.Errorf("deleting instance %s during CheckDestroy: %w", *items[i].Id, err) +// } +// } +// } +// return nil +//} + func testAccCheckPostgresFlexDestroy(s *terraform.State) error { testutils.Setup() @@ -799,7 +1196,7 @@ func testAccCheckPostgresFlexDestroy(s *terraform.State) error { testutils.ProjectId, testutils.Region, items[i].Id, - 30*time.Minute, + 15*time.Minute, 10*time.Second, ) if err != nil { @@ -809,182 +1206,3 @@ func testAccCheckPostgresFlexDestroy(s *terraform.State) error { } return nil } - -func defaultNoEncInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - defaultInstanceTestChecks(testItemID, data), - - // check absent attr - resource.TestCheckNoResourceAttr(testItemID, "encryption"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_id"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_ring_id"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_version"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.service_account"), - ) -} - -func defaultEncInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - defaultInstanceTestChecks(testItemID, data), - - // check absent attr - resource.TestCheckResourceAttr(testItemID, "encryption.%", "4"), - resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_id"), - resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_id", data.KekKeyID), - resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_ring_id"), - resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_ring_id", data.KekKeyRingID), - resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_version"), - resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_version", strconv.Itoa(int(data.KekKeyVersion))), - resource.TestCheckResourceAttrSet(testItemID, "encryption.service_account"), - resource.TestCheckResourceAttr(testItemID, "encryption.service_account", data.KekServiceAccount), - ) -} - -func defaultInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - // if AccessScope == SNA these are set - if data.AccessScope == "SNA" { - return resource.ComposeAggregateTestCheckFunc( - basicInstanceTestChecks(testItemID, data), - resource.TestCheckResourceAttrSet(testItemID, "network.instance_address"), - resource.TestCheckResourceAttrSet(testItemID, "network.router_address"), - ) - } - - // if AccessScope == PUBLIC these are empty - but they are set - return resource.ComposeAggregateTestCheckFunc( - basicInstanceTestChecks(testItemID, data), - resource.TestCheckResourceAttr(testItemID, "network.instance_address", ""), - resource.TestCheckResourceAttr(testItemID, "network.router_address", ""), - ) -} - -func basicInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrSet(testItemID, "backup_schedule"), - resource.TestCheckResourceAttr(testItemID, "backup_schedule", data.BackupSchedule), - - resource.TestCheckResourceAttr(testItemID, "connection_info.%", "1"), - resource.TestCheckResourceAttr(testItemID, "connection_info.write.%", "2"), - resource.TestCheckResourceAttrSet(testItemID, "connection_info.write.host"), - resource.TestCheckResourceAttrSet(testItemID, "connection_info.write.port"), - - resource.TestCheckResourceAttrSet(testItemID, "flavor_id"), - resource.TestCheckResourceAttr(testItemID, "flavor_id", data.FlavorID), - - resource.TestCheckResourceAttrSet(testItemID, "id"), - resource.TestCheckResourceAttrSet(testItemID, "instance_id"), - - resource.TestCheckResourceAttrSet(testItemID, "is_deletable"), - resource.TestCheckResourceAttr(testItemID, "is_deletable", "true"), - - resource.TestCheckResourceAttrSet(testItemID, "name"), - resource.TestCheckResourceAttr(testItemID, "name", data.Name), - - // network params check - resource.TestCheckResourceAttr(testItemID, "network.%", "4"), - resource.TestCheckResourceAttrSet(testItemID, "network.access_scope"), - resource.TestCheckResourceAttr(testItemID, "network.access_scope", data.AccessScope), - // resource.TestCheckResourceAttrSet(testItemID, "network.acl"), - resource.TestCheckResourceAttr(testItemID, "network.acl.#", strconv.Itoa(len(data.ACLStrings))), - // instance_address and router_address are only checked in enc - - resource.TestCheckResourceAttrSet(testItemID, "project_id"), - resource.TestCheckResourceAttr(testItemID, "project_id", data.ProjectID), - - resource.TestCheckResourceAttrSet(testItemID, "region"), - resource.TestCheckResourceAttr(testItemID, "region", data.Region), - - resource.TestCheckResourceAttrSet(testItemID, "replicas"), - resource.TestCheckResourceAttr(testItemID, "replicas", strconv.Itoa(int(data.Replicas))), - - resource.TestCheckResourceAttrSet(testItemID, "retention_days"), - resource.TestCheckResourceAttr(testItemID, "retention_days", strconv.Itoa(int(data.RetentionDays))), - - resource.TestCheckResourceAttrSet(testItemID, "status"), - resource.TestCheckResourceAttr(testItemID, "status", "READY"), - - // storage params check - resource.TestCheckResourceAttr(testItemID, "storage.%", "2"), - resource.TestCheckResourceAttrSet(testItemID, "storage.performance_class"), - resource.TestCheckResourceAttr(testItemID, "storage.performance_class", data.PerformanceClass), - resource.TestCheckResourceAttrSet(testItemID, "storage.size"), - resource.TestCheckResourceAttr(testItemID, "storage.size", strconv.Itoa(int(data.Size))), - - resource.TestCheckResourceAttrSet(testItemID, "version"), - resource.TestCheckResourceAttr(testItemID, "version", data.Version), - ) -} - -func getInstanceTestID(name string) func(s *terraform.State) (string, error) { - return func(s *terraform.State) (string, error) { - r, ok := s.RootModule().Resources[testutils.ResStr(pfx, "instance", name)] - if !ok { - return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.%s", name) - } - projectID, ok := r.Primary.Attributes["project_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute project_id") - } - region, ok := r.Primary.Attributes["region"] - if !ok { - return "", fmt.Errorf("couldn't find attribute region") - } - instanceID, ok := r.Primary.Attributes["instance_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute instance_id") - } - return fmt.Sprintf("%s,%s,%s", projectID, region, instanceID), nil - } -} - -func getDatabaseTestID(name string) func(s *terraform.State) (string, error) { - return func(s *terraform.State) (string, error) { - r, ok := s.RootModule().Resources[testutils.ResStr(pfx, "database", name)] - if !ok { - return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.%s", name) - } - projectID, ok := r.Primary.Attributes["project_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute project_id") - } - region, ok := r.Primary.Attributes["region"] - if !ok { - return "", fmt.Errorf("couldn't find attribute region") - } - instanceID, ok := r.Primary.Attributes["instance_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute instance_id") - } - databaseID, ok := r.Primary.Attributes["database_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute database_id") - } - return fmt.Sprintf("%s,%s,%s,%s", projectID, region, instanceID, databaseID), nil - } -} - -func getUserTestID(name string) func(s *terraform.State) (string, error) { - return func(s *terraform.State) (string, error) { - r, ok := s.RootModule().Resources[testutils.ResStr(pfx, "user", name)] - if !ok { - return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.%s", name) - } - projectID, ok := r.Primary.Attributes["project_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute project_id") - } - region, ok := r.Primary.Attributes["region"] - if !ok { - return "", fmt.Errorf("couldn't find attribute region") - } - instanceID, ok := r.Primary.Attributes["instance_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute instance_id") - } - userID, ok := r.Primary.Attributes["user_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute user_id") - } - return fmt.Sprintf("%s,%s,%s,%s", projectID, region, instanceID, userID), nil - } -} diff --git a/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl b/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl index ce6b9ac2..d0ab3f25 100644 --- a/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl +++ b/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl @@ -23,21 +23,16 @@ resource "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { } {{ end }} network = { - acl = [{{ range $i, $v := .ACLStrings }}{{if $i}},{{end}}"{{$v}}"{{end}}] + acl = ["{{ .ACLString }}"] access_scope = "{{ .AccessScope }}" } -{{ if .Version }} - version = "{{ .Version }}" -{{ end }} + version = {{ .Version }} } {{ if .Users }} {{ $tfName := .TfName }} {{ range $user := .Users }} resource "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { - depends_on = [ - stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }} - ] project_id = "{{ $user.ProjectID }}" instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id name = "{{ $user.Name }}" @@ -50,10 +45,6 @@ resource "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { {{ $tfName := .TfName }} {{ range $db := .Databases }} resource "stackitprivatepreview_postgresflexalpha_database" "{{ $db.Name }}" { - depends_on = [ - stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}, - stackitprivatepreview_postgresflexalpha_user.{{ $db.Owner }} - ] project_id = "{{ $db.ProjectID }}" instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id name = "{{ $db.Name }}" @@ -61,32 +52,3 @@ resource "stackitprivatepreview_postgresflexalpha_database" "{{ $db.Name }}" { } {{ end }} {{ end }} - -{{ if .DataSourceTest }} -data "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { - project_id = stackitprivatepreview_postgresflexalpha_instance.{{ .TfName }}.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ .TfName }}.instance_id -} - -{{ if .Users }} -{{ $tfName := .TfName }} -{{ range $user := .Users }} -data "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { - project_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id - user_id = stackitprivatepreview_postgresflexalpha_user.{{ $user.Name }}.user_id -} -{{ end }} -{{ end }} - -{{ if .Databases }} -{{ $tfName := .TfName }} -{{ range $db := .Databases }} -data "stackitprivatepreview_postgresflexalpha_database" "{{ $db.Name }}" { - project_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id - database_id = stackitprivatepreview_postgresflexalpha_database.{{ $db.Name }}.database_id -} -{{ end }} -{{ end }} -{{ end }} diff --git a/stackit/internal/services/postgresflexalpha/testdata/instance_template_with_flavor.gompl b/stackit/internal/services/postgresflexalpha/testdata/instance_template_with_flavor.gompl deleted file mode 100644 index 70d0692f..00000000 --- a/stackit/internal/services/postgresflexalpha/testdata/instance_template_with_flavor.gompl +++ /dev/null @@ -1,101 +0,0 @@ -provider "stackitprivatepreview" { - default_region = "{{ .Region }}" - service_account_key_path = "{{ .ServiceAccountFilePath }}" -} - -data "stackitprivatepreview_postgresflexalpha_flavor" "flavor" { - project_id = "{{ .ProjectID }}" - region = "{{ .Region }}" - cpu = 4 - ram = 16 - node_type = "Single" - storage_class = "premium-perf2-stackit" -} - -resource "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { - project_id = "{{ .ProjectID }}" - name = "{{ .Name }}" - backup_schedule = "{{ .BackupSchedule }}" - retention_days = {{ .RetentionDays }} - flavor_id = "{{ .FlavorID }}" - replicas = {{ .Replicas }} - storage = { - performance_class = "{{ .PerformanceClass }}" - size = {{ .Size }} - } -{{ if .UseEncryption }} - encryption = { - kek_key_id = "{{ .KekKeyID }}" - kek_key_ring_id = "{{ .KekKeyRingID }}" - kek_key_version = {{ .KekKeyVersion }} - service_account = "{{ .KekServiceAccount }}" - } -{{ end }} - network = { - acl = [{{ range $i, $v := .ACLStrings }}{{if $i}},{{end}}"{{$v}}"{{end}}] - access_scope = "{{ .AccessScope }}" - } -{{ if .Version }} - version = "{{ .Version }}" -{{ end }} -} - -{{ if .Users }} -{{ $tfName := .TfName }} -{{ range $user := .Users }} -resource "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { - depends_on = [ - stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }} - ] - project_id = "{{ $user.ProjectID }}" - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id - name = "{{ $user.Name }}" - roles = [{{ range $i, $v := $user.Roles }}{{if $i}},{{end}}"{{$v}}"{{end}}] -} -{{ end }} -{{ end }} - -{{ if .Databases }} -{{ $tfName := .TfName }} -{{ range $db := .Databases }} -resource "stackitprivatepreview_postgresflexalpha_database" "{{ $db.Name }}" { - depends_on = [ - stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}, - stackitprivatepreview_postgresflexalpha_user.{{ $db.Owner }} - ] - project_id = "{{ $db.ProjectID }}" - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id - name = "{{ $db.Name }}" - owner = stackitprivatepreview_postgresflexalpha_user.{{ $db.Owner }}.name -} -{{ end }} -{{ end }} - -{{ if .DataSourceTest }} -data "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { - project_id = stackitprivatepreview_postgresflexalpha_instance.{{ .TfName }}.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ .TfName }}.instance_id -} - -{{ if .Users }} -{{ $tfName := .TfName }} -{{ range $user := .Users }} -data "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { - project_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id - user_id = stackitprivatepreview_postgresflexalpha_user.{{ $user.Name }}.user_id -} -{{ end }} -{{ end }} - -{{ if .Databases }} -{{ $tfName := .TfName }} -{{ range $db := .Databases }} -data "stackitprivatepreview_postgresflexalpha_database" "{{ $db.Name }}" { - project_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.project_id - instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id - database_id = stackitprivatepreview_postgresflexalpha_database.{{ $db.Name }}.database_id -} -{{ end }} -{{ end }} -{{ end }} diff --git a/stackit/internal/services/postgresflexalpha/user/datasources_gen/user_data_source_gen.go b/stackit/internal/services/postgresflexalpha/user/datasources_gen/user_data_source_gen.go index 37f3c7c6..29a7cca0 100644 --- a/stackit/internal/services/postgresflexalpha/user/datasources_gen/user_data_source_gen.go +++ b/stackit/internal/services/postgresflexalpha/user/datasources_gen/user_data_source_gen.go @@ -35,7 +35,7 @@ func UserDataSourceSchema(ctx context.Context) schema.Schema { MarkdownDescription: "The STACKIT project ID.", }, "region": schema.StringAttribute{ - Optional: true, + Required: true, Description: "The region which should be addressed", MarkdownDescription: "The region which should be addressed", Validators: []validator.String{ diff --git a/stackit/internal/services/postgresflexalpha/user/mapper.go b/stackit/internal/services/postgresflexalpha/user/mapper.go index 70c53b83..dcf4545c 100644 --- a/stackit/internal/services/postgresflexalpha/user/mapper.go +++ b/stackit/internal/services/postgresflexalpha/user/mapper.go @@ -116,12 +116,7 @@ func mapResourceFields(userResp *v3alpha1api.GetUserResponse, model *resourceMod return fmt.Errorf("user id not present") } - model.Id = utils.BuildInternalTerraformId( - model.ProjectId.ValueString(), - model.Region.ValueString(), - model.InstanceId.ValueString(), - strconv.FormatInt(userID, 10), - ) + model.Id = types.Int64Value(userID) model.UserId = types.Int64Value(userID) model.Name = types.StringValue(user.Name) diff --git a/stackit/internal/services/postgresflexalpha/user/mapper_test.go b/stackit/internal/services/postgresflexalpha/user/mapper_test.go index f8c01fc2..5b07ede8 100644 --- a/stackit/internal/services/postgresflexalpha/user/mapper_test.go +++ b/stackit/internal/services/postgresflexalpha/user/mapper_test.go @@ -1,7 +1,6 @@ package postgresflexalpha import ( - "fmt" "testing" "github.com/google/go-cmp/cmp" @@ -166,7 +165,7 @@ func TestMapFieldsCreate(t *testing.T) { }, testRegion, resourceModel{ - Id: types.StringValue(fmt.Sprintf("%s,%s,%s,%d", "pid", testRegion, "iid", 1)), + Id: types.Int64Value(1), UserId: types.Int64Value(1), InstanceId: types.StringValue("iid"), ProjectId: types.StringValue("pid"), @@ -188,7 +187,7 @@ func TestMapFieldsCreate(t *testing.T) { }, testRegion, resourceModel{ - Id: types.StringValue(fmt.Sprintf("%s,%s,%s,%d", "pid", testRegion, "iid", 1)), + Id: types.Int64Value(1), UserId: types.Int64Value(1), InstanceId: types.StringValue("iid"), ProjectId: types.StringValue("pid"), @@ -210,7 +209,7 @@ func TestMapFieldsCreate(t *testing.T) { }, testRegion, resourceModel{ - Id: types.StringValue(fmt.Sprintf("%s,%s,%s,%d", "pid", testRegion, "iid", 1)), + Id: types.Int64Value(1), UserId: types.Int64Value(1), InstanceId: types.StringValue("iid"), ProjectId: types.StringValue("pid"), @@ -250,7 +249,6 @@ func TestMapFieldsCreate(t *testing.T) { tt.description, func(t *testing.T) { state := &resourceModel{ ProjectId: tt.expected.ProjectId, - Region: types.StringValue(testRegion), InstanceId: tt.expected.InstanceId, } @@ -288,7 +286,7 @@ func TestMapFields(t *testing.T) { }, testRegion, resourceModel{ - Id: types.StringValue(fmt.Sprintf("%s,%s,%s,%d", "pid", testRegion, "iid", 1)), + Id: types.Int64Value(1), UserId: types.Int64Value(int64(1)), InstanceId: types.StringValue("iid"), ProjectId: types.StringValue("pid"), @@ -313,7 +311,7 @@ func TestMapFields(t *testing.T) { }, testRegion, resourceModel{ - Id: types.StringValue(fmt.Sprintf("%s,%s,%s,%d", "pid", testRegion, "iid", 1)), + Id: types.Int64Value(1), UserId: types.Int64Value(1), InstanceId: types.StringValue("iid"), ProjectId: types.StringValue("pid"), @@ -341,7 +339,7 @@ func TestMapFields(t *testing.T) { }, testRegion, resourceModel{ - Id: types.StringValue(fmt.Sprintf("%s,%s,%s,%d", "pid", testRegion, "iid", 1)), + Id: types.Int64Value(1), UserId: types.Int64Value(1), InstanceId: types.StringValue("iid"), ProjectId: types.StringValue("pid"), @@ -381,7 +379,6 @@ func TestMapFields(t *testing.T) { state := &resourceModel{ ProjectId: tt.expected.ProjectId, InstanceId: tt.expected.InstanceId, - Region: types.StringValue(tt.region), } err := mapResourceFields(tt.input, state, tt.region) if !tt.isValid && err == nil { @@ -391,7 +388,7 @@ func TestMapFields(t *testing.T) { t.Fatalf("Should not have failed: %v", err) } if tt.isValid { - diff := cmp.Diff(&tt.expected, state) + diff := cmp.Diff(state, &tt.expected) if diff != "" { t.Fatalf("Data does not match: %s", diff) } @@ -479,7 +476,7 @@ func TestToCreatePayload(t *testing.T) { t.Fatalf("Should not have failed: %v", err) } if tt.isValid { - diff := cmp.Diff(tt.expected, output) + diff := cmp.Diff(output, tt.expected) if diff != "" { t.Fatalf("Data does not match: %s", diff) } diff --git a/stackit/internal/services/postgresflexalpha/user/resource.go b/stackit/internal/services/postgresflexalpha/user/resource.go index eb537a60..065c9552 100644 --- a/stackit/internal/services/postgresflexalpha/user/resource.go +++ b/stackit/internal/services/postgresflexalpha/user/resource.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/stackitcloud/stackit-sdk-go/core/oapierror" + "github.com/hashicorp/terraform-plugin-framework/resource/identityschema" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api" postgresflexalpha "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/user/resources_gen" @@ -34,7 +34,12 @@ var ( _ resource.ResourceWithConfigure = &userResource{} _ resource.ResourceWithImportState = &userResource{} _ resource.ResourceWithModifyPlan = &userResource{} + _ resource.ResourceWithIdentity = &userResource{} _ resource.ResourceWithValidateConfig = &userResource{} + + // Error message constants + extractErrorSummary = "extracting failed" + extractErrorMessage = "Extracting identity data: %v" ) // NewUserResource is a helper function to simplify the provider implementation. @@ -45,6 +50,14 @@ func NewUserResource() resource.Resource { // resourceModel represents the Terraform resource state for a PostgreSQL Flex user. type resourceModel = postgresflexalpha.UserModel +// UserResourceIdentityModel describes the resource's identity attributes. +type UserResourceIdentityModel struct { + ProjectID types.String `tfsdk:"project_id"` + Region types.String `tfsdk:"region"` + InstanceID types.String `tfsdk:"instance_id"` + UserID types.Int64 `tfsdk:"user_id"` +} + // userResource implements the resource handling for a PostgreSQL Flex user. type userResource struct { client *v3alpha1api.APIClient @@ -219,14 +232,23 @@ func (r *userResource) Create( } arg.userID = int64(*id) - model.Id = utils.BuildInternalTerraformId(arg.projectID, arg.region, arg.instanceID, strconv.FormatInt(arg.userID, 10)) - - ctx = tflog.SetField(ctx, "id", model.Id.ValueString()) ctx = tflog.SetField(ctx, "user_id", id) ctx = core.LogResponse(ctx) - model.Id = utils.BuildInternalTerraformId(arg.projectID, arg.region, arg.instanceID, strconv.FormatInt(arg.userID, 10)) + // Set data returned by API in identity + identity := UserResourceIdentityModel{ + ProjectID: types.StringValue(arg.projectID), + Region: types.StringValue(arg.region), + InstanceID: types.StringValue(arg.instanceID), + UserID: types.Int64Value(int64(*id)), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + + model.Id = types.Int64Value(int64(*id)) model.UserId = types.Int64Value(int64(*id)) model.Password = types.StringValue(userResp.GetPassword()) model.Status = types.StringValue(userResp.GetStatus()) @@ -241,7 +263,7 @@ func (r *userResource) Create( ).SetSleepBeforeWait( 10 * time.Second, ).SetTimeout( - 30 * time.Minute, + 15 * time.Minute, ).WaitWithContext(ctx) if err != nil { @@ -322,7 +344,7 @@ func (r *userResource) Read( ).SetSleepBeforeWait( 10 * time.Second, ).SetTimeout( - 30 * time.Minute, + 15 * time.Minute, ).WaitWithContext(ctx) if err != nil { @@ -348,14 +370,15 @@ func (r *userResource) Read( ctx = core.LogResponse(ctx) - err = mapResourceFields(waitResp, &model, model.Region.ValueString()) - if err != nil { - core.LogAndAddError( - ctx, - &resp.Diagnostics, - "read user", - fmt.Sprintf("Wait response mapping: %v", err), - ) + // Set data returned by API in identity + identity := UserResourceIdentityModel{ + ProjectID: types.StringValue(arg.projectID), + Region: types.StringValue(arg.region), + InstanceID: types.StringValue(arg.instanceID), + UserID: types.Int64Value(arg.userID), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { return } @@ -434,6 +457,18 @@ func (r *userResource) Update( ctx = core.LogResponse(ctx) + // Set data returned by API in identity + identity := UserResourceIdentityModel{ + ProjectID: types.StringValue(arg.projectID), + Region: types.StringValue(arg.region), + InstanceID: types.StringValue(arg.instanceID), + UserID: types.Int64Value(userID64), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + // Verify update waitResp, err := postgresflexalphaWait.GetUserByIdWaitHandler( ctx, @@ -445,7 +480,7 @@ func (r *userResource) Update( ).SetSleepBeforeWait( 10 * time.Second, ).SetTimeout( - 30 * time.Minute, + 15 * time.Minute, ).WaitWithContext(ctx) if err != nil { @@ -490,17 +525,26 @@ func (r *userResource) Delete( if resp.Diagnostics.HasError() { return } + // Read identity data + var identityData UserResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } ctx = core.InitProviderContext(ctx) - arg := clientArg{ - projectID: model.ProjectId.ValueString(), - instanceID: model.InstanceId.ValueString(), - region: model.Region.ValueString(), - userID: model.UserId.ValueInt64(), + arg, errExt := r.extractIdentityData(model, identityData) + if errExt != nil { + core.LogAndAddError( + ctx, + &resp.Diagnostics, + extractErrorSummary, + fmt.Sprintf(extractErrorMessage, errExt), + ) } - ctx = r.setTFLogFields(ctx, &arg) + ctx = r.setTFLogFields(ctx, arg) ctx = core.InitProviderContext(ctx) userID64 := arg.userID @@ -513,14 +557,7 @@ func (r *userResource) Delete( // Delete existing record set err := r.client.DefaultAPI.DeleteUserRequest(ctx, arg.projectID, arg.region, arg.instanceID, userID).Execute() if err != nil { - oapiErr, ok := err.(*oapierror.GenericOpenAPIError) // nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped - if ok { - if oapiErr.StatusCode == 404 { - resp.State.RemoveResource(ctx) - return - } - } - core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting user", fmt.Sprintf("error from API: %v", err)) + core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting user", fmt.Sprintf("Calling API: %v", err)) } ctx = core.LogResponse(ctx) @@ -544,6 +581,30 @@ func (r *userResource) Delete( tflog.Info(ctx, "Postgres Flex user deleted") } +// IdentitySchema defines the fields that are required to uniquely identify a resource. +func (r *userResource) IdentitySchema( + _ context.Context, + _ resource.IdentitySchemaRequest, + response *resource.IdentitySchemaResponse, +) { + response.IdentitySchema = identityschema.Schema{ + Attributes: map[string]identityschema.Attribute{ + "project_id": identityschema.StringAttribute{ + RequiredForImport: true, + }, + "region": identityschema.StringAttribute{ + RequiredForImport: true, + }, + "instance_id": identityschema.StringAttribute{ + RequiredForImport: true, + }, + "user_id": identityschema.Int64Attribute{ + RequiredForImport: true, + }, + }, + } +} + // clientArg holds the arguments for API calls. type clientArg struct { projectID string @@ -561,41 +622,112 @@ func (r *userResource) ImportState( ) { ctx = core.InitProviderContext(ctx) - idParts := strings.Split(req.ID, core.Separator) + if req.ID != "" { + idParts := strings.Split(req.ID, core.Separator) + + if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" { + core.LogAndAddError( + ctx, &resp.Diagnostics, + "Error importing user", + fmt.Sprintf( + "Expected import identifier with format [project_id],[region],[instance_id],[user_id], got %q", + req.ID, + ), + ) + return + } + + userID, err := strconv.ParseInt(idParts[3], 10, 64) + if err != nil { + core.LogAndAddError( + ctx, + &resp.Diagnostics, + "Error importing user", + fmt.Sprintf("Invalid user_id format: %q. It must be a valid integer.", idParts[3]), + ) + return + } + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_id"), userID)...) + + tflog.Info(ctx, "Postgres Flex user state imported") - if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" { - core.LogAndAddError( - ctx, &resp.Diagnostics, - "Error importing user", - fmt.Sprintf( - "Expected import identifier with format [project_id],[region],[instance_id],[user_id], got %q", - req.ID, - ), - ) return } - userID, err := strconv.ParseInt(idParts[3], 10, 64) - if err != nil { - core.LogAndAddError( - ctx, - &resp.Diagnostics, - "Error importing user", - fmt.Sprintf("Invalid user_id format: %q. It must be a valid integer.", idParts[3]), - ) + // If no ID is provided, attempt to read identity attributes from the import configuration + var identityData UserResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { return } - idString := utils.BuildInternalTerraformId(idParts...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("id"), idString)...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) + projectID := identityData.ProjectID.ValueString() + region := identityData.Region.ValueString() + instanceID := identityData.InstanceID.ValueString() + userID := identityData.UserID.ValueInt64() + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), projectID)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), region)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), instanceID)...) resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_id"), userID)...) tflog.Info(ctx, "Postgres Flex user state imported") } +// extractIdentityData extracts essential identifiers from the resource model, falling back to the identity model. +func (r *userResource) extractIdentityData( + model resourceModel, + identity UserResourceIdentityModel, +) (*clientArg, error) { + var projectID, region, instanceID string + var userID int64 + if !model.UserId.IsNull() && !model.UserId.IsUnknown() { + userID = model.UserId.ValueInt64() + } else { + if identity.UserID.IsNull() || identity.UserID.IsUnknown() { + return nil, fmt.Errorf("user_id not found in config") + } + userID = identity.UserID.ValueInt64() + } + + if !model.ProjectId.IsNull() && !model.ProjectId.IsUnknown() { + projectID = model.ProjectId.ValueString() + } else { + if identity.ProjectID.IsNull() || identity.ProjectID.IsUnknown() { + return nil, fmt.Errorf("project_id not found in config") + } + projectID = identity.ProjectID.ValueString() + } + + if !model.Region.IsNull() && !model.Region.IsUnknown() { + region = r.providerData.GetRegionWithOverride(model.Region) + } else { + if identity.Region.IsNull() || identity.Region.IsUnknown() { + return nil, fmt.Errorf("region not found in config") + } + region = r.providerData.GetRegionWithOverride(identity.Region) + } + + if !model.InstanceId.IsNull() && !model.InstanceId.IsUnknown() { + instanceID = model.InstanceId.ValueString() + } else { + if identity.InstanceID.IsNull() || identity.InstanceID.IsUnknown() { + return nil, fmt.Errorf("instance_id not found in config") + } + instanceID = identity.InstanceID.ValueString() + } + return &clientArg{ + projectID: projectID, + instanceID: instanceID, + region: region, + userID: userID, + }, nil +} + // setTFLogFields adds relevant fields to the context for terraform logging purposes. func (r *userResource) setTFLogFields(ctx context.Context, arg *clientArg) context.Context { ctx = tflog.SetField(ctx, "project_id", arg.projectID) diff --git a/stackit/internal/services/postgresflexalpha/user/resources_gen/user_resource_gen.go b/stackit/internal/services/postgresflexalpha/user/resources_gen/user_resource_gen.go index 3e2d1e63..f96d8d93 100644 --- a/stackit/internal/services/postgresflexalpha/user/resources_gen/user_resource_gen.go +++ b/stackit/internal/services/postgresflexalpha/user/resources_gen/user_resource_gen.go @@ -14,7 +14,7 @@ import ( func UserResourceSchema(ctx context.Context) schema.Schema { return schema.Schema{ Attributes: map[string]schema.Attribute{ - "id": schema.StringAttribute{ + "id": schema.Int64Attribute{ Computed: true, Description: "The ID of the user.", MarkdownDescription: "The ID of the user.", @@ -75,7 +75,7 @@ func UserResourceSchema(ctx context.Context) schema.Schema { } type UserModel struct { - Id types.String `tfsdk:"id"` + Id types.Int64 `tfsdk:"id"` InstanceId types.String `tfsdk:"instance_id"` Name types.String `tfsdk:"name"` Password types.String `tfsdk:"password"` diff --git a/stackit/internal/services/postgresflexalpha/versions/datasources_gen/versions_data_source_gen.go b/stackit/internal/services/postgresflexalpha/version/datasources_gen/versions_data_source_gen.go similarity index 100% rename from stackit/internal/services/postgresflexalpha/versions/datasources_gen/versions_data_source_gen.go rename to stackit/internal/services/postgresflexalpha/version/datasources_gen/versions_data_source_gen.go diff --git a/stackit/internal/services/sqlserverflexalpha/collations/datasources_gen/collations_data_source_gen.go b/stackit/internal/services/sqlserverflexalpha/collations/datasources_gen/collations_data_source_gen.go deleted file mode 100644 index a0f13e40..00000000 --- a/stackit/internal/services/sqlserverflexalpha/collations/datasources_gen/collations_data_source_gen.go +++ /dev/null @@ -1,451 +0,0 @@ -// Code generated by terraform-plugin-framework-generator DO NOT EDIT. - -package sqlserverflexalpha - -import ( - "context" - "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/hashicorp/terraform-plugin-framework/schema/validator" - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/hashicorp/terraform-plugin-go/tftypes" - "strings" - - "github.com/hashicorp/terraform-plugin-framework/datasource/schema" -) - -func CollationsDataSourceSchema(ctx context.Context) schema.Schema { - return schema.Schema{ - Attributes: map[string]schema.Attribute{ - "collations": schema.ListNestedAttribute{ - NestedObject: schema.NestedAttributeObject{ - Attributes: map[string]schema.Attribute{ - "collation_name": schema.StringAttribute{ - Computed: true, - }, - "description": schema.StringAttribute{ - Computed: true, - }, - }, - CustomType: CollationsType{ - ObjectType: types.ObjectType{ - AttrTypes: CollationsValue{}.AttributeTypes(ctx), - }, - }, - }, - Computed: true, - Description: "List of collations available for the instance.", - MarkdownDescription: "List of collations available for the instance.", - }, - "instance_id": schema.StringAttribute{ - Required: true, - Description: "The ID of the instance.", - MarkdownDescription: "The ID of the instance.", - }, - "project_id": schema.StringAttribute{ - Required: true, - Description: "The STACKIT project ID.", - MarkdownDescription: "The STACKIT project ID.", - }, - "region": schema.StringAttribute{ - Optional: true, - Description: "The region which should be addressed", - MarkdownDescription: "The region which should be addressed", - Validators: []validator.String{ - stringvalidator.OneOf( - "eu01", - ), - }, - }, - }, - } -} - -type CollationsModel struct { - Collations types.List `tfsdk:"collations"` - InstanceId types.String `tfsdk:"instance_id"` - ProjectId types.String `tfsdk:"project_id"` - Region types.String `tfsdk:"region"` -} - -var _ basetypes.ObjectTypable = CollationsType{} - -type CollationsType struct { - basetypes.ObjectType -} - -func (t CollationsType) Equal(o attr.Type) bool { - other, ok := o.(CollationsType) - - if !ok { - return false - } - - return t.ObjectType.Equal(other.ObjectType) -} - -func (t CollationsType) String() string { - return "CollationsType" -} - -func (t CollationsType) ValueFromObject(ctx context.Context, in basetypes.ObjectValue) (basetypes.ObjectValuable, diag.Diagnostics) { - var diags diag.Diagnostics - - attributes := in.Attributes() - - collationNameAttribute, ok := attributes["collation_name"] - - if !ok { - diags.AddError( - "Attribute Missing", - `collation_name is missing from object`) - - return nil, diags - } - - collationNameVal, ok := collationNameAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`collation_name expected to be basetypes.StringValue, was: %T`, collationNameAttribute)) - } - - descriptionAttribute, ok := attributes["description"] - - if !ok { - diags.AddError( - "Attribute Missing", - `description is missing from object`) - - return nil, diags - } - - descriptionVal, ok := descriptionAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`description expected to be basetypes.StringValue, was: %T`, descriptionAttribute)) - } - - if diags.HasError() { - return nil, diags - } - - return CollationsValue{ - CollationName: collationNameVal, - Description: descriptionVal, - state: attr.ValueStateKnown, - }, diags -} - -func NewCollationsValueNull() CollationsValue { - return CollationsValue{ - state: attr.ValueStateNull, - } -} - -func NewCollationsValueUnknown() CollationsValue { - return CollationsValue{ - state: attr.ValueStateUnknown, - } -} - -func NewCollationsValue(attributeTypes map[string]attr.Type, attributes map[string]attr.Value) (CollationsValue, diag.Diagnostics) { - var diags diag.Diagnostics - - // Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/521 - ctx := context.Background() - - for name, attributeType := range attributeTypes { - attribute, ok := attributes[name] - - if !ok { - diags.AddError( - "Missing CollationsValue Attribute Value", - "While creating a CollationsValue value, a missing attribute value was detected. "+ - "A CollationsValue must contain values for all attributes, even if null or unknown. "+ - "This is always an issue with the provider and should be reported to the provider developers.\n\n"+ - fmt.Sprintf("CollationsValue Attribute Name (%s) Expected Type: %s", name, attributeType.String()), - ) - - continue - } - - if !attributeType.Equal(attribute.Type(ctx)) { - diags.AddError( - "Invalid CollationsValue Attribute Type", - "While creating a CollationsValue value, an invalid attribute value was detected. "+ - "A CollationsValue must use a matching attribute type for the value. "+ - "This is always an issue with the provider and should be reported to the provider developers.\n\n"+ - fmt.Sprintf("CollationsValue Attribute Name (%s) Expected Type: %s\n", name, attributeType.String())+ - fmt.Sprintf("CollationsValue Attribute Name (%s) Given Type: %s", name, attribute.Type(ctx)), - ) - } - } - - for name := range attributes { - _, ok := attributeTypes[name] - - if !ok { - diags.AddError( - "Extra CollationsValue Attribute Value", - "While creating a CollationsValue value, an extra attribute value was detected. "+ - "A CollationsValue must not contain values beyond the expected attribute types. "+ - "This is always an issue with the provider and should be reported to the provider developers.\n\n"+ - fmt.Sprintf("Extra CollationsValue Attribute Name: %s", name), - ) - } - } - - if diags.HasError() { - return NewCollationsValueUnknown(), diags - } - - collationNameAttribute, ok := attributes["collation_name"] - - if !ok { - diags.AddError( - "Attribute Missing", - `collation_name is missing from object`) - - return NewCollationsValueUnknown(), diags - } - - collationNameVal, ok := collationNameAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`collation_name expected to be basetypes.StringValue, was: %T`, collationNameAttribute)) - } - - descriptionAttribute, ok := attributes["description"] - - if !ok { - diags.AddError( - "Attribute Missing", - `description is missing from object`) - - return NewCollationsValueUnknown(), diags - } - - descriptionVal, ok := descriptionAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`description expected to be basetypes.StringValue, was: %T`, descriptionAttribute)) - } - - if diags.HasError() { - return NewCollationsValueUnknown(), diags - } - - return CollationsValue{ - CollationName: collationNameVal, - Description: descriptionVal, - state: attr.ValueStateKnown, - }, diags -} - -func NewCollationsValueMust(attributeTypes map[string]attr.Type, attributes map[string]attr.Value) CollationsValue { - object, diags := NewCollationsValue(attributeTypes, attributes) - - if diags.HasError() { - // This could potentially be added to the diag package. - diagsStrings := make([]string, 0, len(diags)) - - for _, diagnostic := range diags { - diagsStrings = append(diagsStrings, fmt.Sprintf( - "%s | %s | %s", - diagnostic.Severity(), - diagnostic.Summary(), - diagnostic.Detail())) - } - - panic("NewCollationsValueMust received error(s): " + strings.Join(diagsStrings, "\n")) - } - - return object -} - -func (t CollationsType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) { - if in.Type() == nil { - return NewCollationsValueNull(), nil - } - - if !in.Type().Equal(t.TerraformType(ctx)) { - return nil, fmt.Errorf("expected %s, got %s", t.TerraformType(ctx), in.Type()) - } - - if !in.IsKnown() { - return NewCollationsValueUnknown(), nil - } - - if in.IsNull() { - return NewCollationsValueNull(), nil - } - - attributes := map[string]attr.Value{} - - val := map[string]tftypes.Value{} - - err := in.As(&val) - - if err != nil { - return nil, err - } - - for k, v := range val { - a, err := t.AttrTypes[k].ValueFromTerraform(ctx, v) - - if err != nil { - return nil, err - } - - attributes[k] = a - } - - return NewCollationsValueMust(CollationsValue{}.AttributeTypes(ctx), attributes), nil -} - -func (t CollationsType) ValueType(ctx context.Context) attr.Value { - return CollationsValue{} -} - -var _ basetypes.ObjectValuable = CollationsValue{} - -type CollationsValue struct { - CollationName basetypes.StringValue `tfsdk:"collation_name"` - Description basetypes.StringValue `tfsdk:"description"` - state attr.ValueState -} - -func (v CollationsValue) ToTerraformValue(ctx context.Context) (tftypes.Value, error) { - attrTypes := make(map[string]tftypes.Type, 2) - - var val tftypes.Value - var err error - - attrTypes["collation_name"] = basetypes.StringType{}.TerraformType(ctx) - attrTypes["description"] = basetypes.StringType{}.TerraformType(ctx) - - objectType := tftypes.Object{AttributeTypes: attrTypes} - - switch v.state { - case attr.ValueStateKnown: - vals := make(map[string]tftypes.Value, 2) - - val, err = v.CollationName.ToTerraformValue(ctx) - - if err != nil { - return tftypes.NewValue(objectType, tftypes.UnknownValue), err - } - - vals["collation_name"] = val - - val, err = v.Description.ToTerraformValue(ctx) - - if err != nil { - return tftypes.NewValue(objectType, tftypes.UnknownValue), err - } - - vals["description"] = val - - if err := tftypes.ValidateValue(objectType, vals); err != nil { - return tftypes.NewValue(objectType, tftypes.UnknownValue), err - } - - return tftypes.NewValue(objectType, vals), nil - case attr.ValueStateNull: - return tftypes.NewValue(objectType, nil), nil - case attr.ValueStateUnknown: - return tftypes.NewValue(objectType, tftypes.UnknownValue), nil - default: - panic(fmt.Sprintf("unhandled Object state in ToTerraformValue: %s", v.state)) - } -} - -func (v CollationsValue) IsNull() bool { - return v.state == attr.ValueStateNull -} - -func (v CollationsValue) IsUnknown() bool { - return v.state == attr.ValueStateUnknown -} - -func (v CollationsValue) String() string { - return "CollationsValue" -} - -func (v CollationsValue) ToObjectValue(ctx context.Context) (basetypes.ObjectValue, diag.Diagnostics) { - var diags diag.Diagnostics - - attributeTypes := map[string]attr.Type{ - "collation_name": basetypes.StringType{}, - "description": basetypes.StringType{}, - } - - if v.IsNull() { - return types.ObjectNull(attributeTypes), diags - } - - if v.IsUnknown() { - return types.ObjectUnknown(attributeTypes), diags - } - - objVal, diags := types.ObjectValue( - attributeTypes, - map[string]attr.Value{ - "collation_name": v.CollationName, - "description": v.Description, - }) - - return objVal, diags -} - -func (v CollationsValue) Equal(o attr.Value) bool { - other, ok := o.(CollationsValue) - - if !ok { - return false - } - - if v.state != other.state { - return false - } - - if v.state != attr.ValueStateKnown { - return true - } - - if !v.CollationName.Equal(other.CollationName) { - return false - } - - if !v.Description.Equal(other.Description) { - return false - } - - return true -} - -func (v CollationsValue) Type(ctx context.Context) attr.Type { - return CollationsType{ - basetypes.ObjectType{ - AttrTypes: v.AttributeTypes(ctx), - }, - } -} - -func (v CollationsValue) AttributeTypes(ctx context.Context) map[string]attr.Type { - return map[string]attr.Type{ - "collation_name": basetypes.StringType{}, - "description": basetypes.StringType{}, - } -} diff --git a/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go.deactivated b/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go similarity index 98% rename from stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go.deactivated rename to stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go index a8b0d874..6d6354ea 100644 --- a/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go.deactivated +++ b/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go @@ -198,10 +198,10 @@ func TestAccInstanceNoEncryption(t *testing.T) { Roles: []string{ "##STACKIT_DatabaseManager##", "##STACKIT_LoginManager##", - // "##STACKIT_ProcessManager##", - // "##STACKIT_SQLAgentManager##", - // "##STACKIT_SQLAgentUser##", - // "##STACKIT_ServerManager##", + //"##STACKIT_ProcessManager##", + //"##STACKIT_SQLAgentManager##", + //"##STACKIT_SQLAgentUser##", + //"##STACKIT_ServerManager##", }, }, } @@ -314,14 +314,11 @@ func TestAccInstanceEncryption(t *testing.T) { data.KekKeyID = os.Getenv("TF_ACC_KEK_KEY_ID") data.KekKeyRingID = os.Getenv("TF_ACC_KEK_KEY_RING_ID") verString := os.Getenv("TF_ACC_KEK_KEY_VERSION") - if verString == "" { - verString = "1" - } version, err := strconv.ParseInt(verString, 0, 32) if err != nil { - t.Errorf("error coverting value to uint8: '%+v'", verString) + t.Errorf("error coverting value to uint8: %+v", verString) } - data.KekKeyVersion = uint8(version) //nolint:gosec // not important it's a test + data.KekKeyVersion = uint8(version) //nolint:gosec // not important its a test data.KekServiceAccount = os.Getenv("TF_ACC_KEK_SERVICE_ACCOUNT") resource.ParallelTest(t, resource.TestCase{ diff --git a/stackit/internal/services/sqlserverflexalpha/versions/datasources_gen/versions_data_source_gen.go b/stackit/internal/services/sqlserverflexalpha/versions/datasources_gen/version_data_source_gen.go similarity index 99% rename from stackit/internal/services/sqlserverflexalpha/versions/datasources_gen/versions_data_source_gen.go rename to stackit/internal/services/sqlserverflexalpha/versions/datasources_gen/version_data_source_gen.go index dc3dc150..cb9008f1 100644 --- a/stackit/internal/services/sqlserverflexalpha/versions/datasources_gen/versions_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexalpha/versions/datasources_gen/version_data_source_gen.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" ) -func VersionsDataSourceSchema(ctx context.Context) schema.Schema { +func VersionDataSourceSchema(ctx context.Context) schema.Schema { return schema.Schema{ Attributes: map[string]schema.Attribute{ "project_id": schema.StringAttribute{ @@ -26,7 +26,7 @@ func VersionsDataSourceSchema(ctx context.Context) schema.Schema { MarkdownDescription: "The STACKIT project ID.", }, "region": schema.StringAttribute{ - Optional: true, + Required: true, Description: "The region which should be addressed", MarkdownDescription: "The region which should be addressed", Validators: []validator.String{ @@ -73,7 +73,7 @@ func VersionsDataSourceSchema(ctx context.Context) schema.Schema { } } -type VersionsModel struct { +type VersionModel struct { ProjectId types.String `tfsdk:"project_id"` Region types.String `tfsdk:"region"` Versions types.List `tfsdk:"versions"` diff --git a/stackit/internal/services/sqlserverflexbeta/collations/datasources_gen/collations_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/collations/datasources_gen/collations_data_source_gen.go deleted file mode 100644 index 7ed20e4d..00000000 --- a/stackit/internal/services/sqlserverflexbeta/collations/datasources_gen/collations_data_source_gen.go +++ /dev/null @@ -1,452 +0,0 @@ -// Code generated by terraform-plugin-framework-generator DO NOT EDIT. - -package sqlserverflexbeta - -import ( - "context" - "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/hashicorp/terraform-plugin-framework/schema/validator" - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/hashicorp/terraform-plugin-go/tftypes" - "strings" - - "github.com/hashicorp/terraform-plugin-framework/datasource/schema" -) - -func CollationsDataSourceSchema(ctx context.Context) schema.Schema { - return schema.Schema{ - Attributes: map[string]schema.Attribute{ - "collations": schema.ListNestedAttribute{ - NestedObject: schema.NestedAttributeObject{ - Attributes: map[string]schema.Attribute{ - "collation_name": schema.StringAttribute{ - Computed: true, - }, - "description": schema.StringAttribute{ - Computed: true, - }, - }, - CustomType: CollationsType{ - ObjectType: types.ObjectType{ - AttrTypes: CollationsValue{}.AttributeTypes(ctx), - }, - }, - }, - Computed: true, - Description: "List of collations available for the instance.", - MarkdownDescription: "List of collations available for the instance.", - }, - "instance_id": schema.StringAttribute{ - Required: true, - Description: "The ID of the instance.", - MarkdownDescription: "The ID of the instance.", - }, - "project_id": schema.StringAttribute{ - Required: true, - Description: "The STACKIT project ID.", - MarkdownDescription: "The STACKIT project ID.", - }, - "region": schema.StringAttribute{ - Optional: true, - Description: "The region which should be addressed", - MarkdownDescription: "The region which should be addressed", - Validators: []validator.String{ - stringvalidator.OneOf( - "eu01", - "eu02", - ), - }, - }, - }, - } -} - -type CollationsModel struct { - Collations types.List `tfsdk:"collations"` - InstanceId types.String `tfsdk:"instance_id"` - ProjectId types.String `tfsdk:"project_id"` - Region types.String `tfsdk:"region"` -} - -var _ basetypes.ObjectTypable = CollationsType{} - -type CollationsType struct { - basetypes.ObjectType -} - -func (t CollationsType) Equal(o attr.Type) bool { - other, ok := o.(CollationsType) - - if !ok { - return false - } - - return t.ObjectType.Equal(other.ObjectType) -} - -func (t CollationsType) String() string { - return "CollationsType" -} - -func (t CollationsType) ValueFromObject(ctx context.Context, in basetypes.ObjectValue) (basetypes.ObjectValuable, diag.Diagnostics) { - var diags diag.Diagnostics - - attributes := in.Attributes() - - collationNameAttribute, ok := attributes["collation_name"] - - if !ok { - diags.AddError( - "Attribute Missing", - `collation_name is missing from object`) - - return nil, diags - } - - collationNameVal, ok := collationNameAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`collation_name expected to be basetypes.StringValue, was: %T`, collationNameAttribute)) - } - - descriptionAttribute, ok := attributes["description"] - - if !ok { - diags.AddError( - "Attribute Missing", - `description is missing from object`) - - return nil, diags - } - - descriptionVal, ok := descriptionAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`description expected to be basetypes.StringValue, was: %T`, descriptionAttribute)) - } - - if diags.HasError() { - return nil, diags - } - - return CollationsValue{ - CollationName: collationNameVal, - Description: descriptionVal, - state: attr.ValueStateKnown, - }, diags -} - -func NewCollationsValueNull() CollationsValue { - return CollationsValue{ - state: attr.ValueStateNull, - } -} - -func NewCollationsValueUnknown() CollationsValue { - return CollationsValue{ - state: attr.ValueStateUnknown, - } -} - -func NewCollationsValue(attributeTypes map[string]attr.Type, attributes map[string]attr.Value) (CollationsValue, diag.Diagnostics) { - var diags diag.Diagnostics - - // Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/521 - ctx := context.Background() - - for name, attributeType := range attributeTypes { - attribute, ok := attributes[name] - - if !ok { - diags.AddError( - "Missing CollationsValue Attribute Value", - "While creating a CollationsValue value, a missing attribute value was detected. "+ - "A CollationsValue must contain values for all attributes, even if null or unknown. "+ - "This is always an issue with the provider and should be reported to the provider developers.\n\n"+ - fmt.Sprintf("CollationsValue Attribute Name (%s) Expected Type: %s", name, attributeType.String()), - ) - - continue - } - - if !attributeType.Equal(attribute.Type(ctx)) { - diags.AddError( - "Invalid CollationsValue Attribute Type", - "While creating a CollationsValue value, an invalid attribute value was detected. "+ - "A CollationsValue must use a matching attribute type for the value. "+ - "This is always an issue with the provider and should be reported to the provider developers.\n\n"+ - fmt.Sprintf("CollationsValue Attribute Name (%s) Expected Type: %s\n", name, attributeType.String())+ - fmt.Sprintf("CollationsValue Attribute Name (%s) Given Type: %s", name, attribute.Type(ctx)), - ) - } - } - - for name := range attributes { - _, ok := attributeTypes[name] - - if !ok { - diags.AddError( - "Extra CollationsValue Attribute Value", - "While creating a CollationsValue value, an extra attribute value was detected. "+ - "A CollationsValue must not contain values beyond the expected attribute types. "+ - "This is always an issue with the provider and should be reported to the provider developers.\n\n"+ - fmt.Sprintf("Extra CollationsValue Attribute Name: %s", name), - ) - } - } - - if diags.HasError() { - return NewCollationsValueUnknown(), diags - } - - collationNameAttribute, ok := attributes["collation_name"] - - if !ok { - diags.AddError( - "Attribute Missing", - `collation_name is missing from object`) - - return NewCollationsValueUnknown(), diags - } - - collationNameVal, ok := collationNameAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`collation_name expected to be basetypes.StringValue, was: %T`, collationNameAttribute)) - } - - descriptionAttribute, ok := attributes["description"] - - if !ok { - diags.AddError( - "Attribute Missing", - `description is missing from object`) - - return NewCollationsValueUnknown(), diags - } - - descriptionVal, ok := descriptionAttribute.(basetypes.StringValue) - - if !ok { - diags.AddError( - "Attribute Wrong Type", - fmt.Sprintf(`description expected to be basetypes.StringValue, was: %T`, descriptionAttribute)) - } - - if diags.HasError() { - return NewCollationsValueUnknown(), diags - } - - return CollationsValue{ - CollationName: collationNameVal, - Description: descriptionVal, - state: attr.ValueStateKnown, - }, diags -} - -func NewCollationsValueMust(attributeTypes map[string]attr.Type, attributes map[string]attr.Value) CollationsValue { - object, diags := NewCollationsValue(attributeTypes, attributes) - - if diags.HasError() { - // This could potentially be added to the diag package. - diagsStrings := make([]string, 0, len(diags)) - - for _, diagnostic := range diags { - diagsStrings = append(diagsStrings, fmt.Sprintf( - "%s | %s | %s", - diagnostic.Severity(), - diagnostic.Summary(), - diagnostic.Detail())) - } - - panic("NewCollationsValueMust received error(s): " + strings.Join(diagsStrings, "\n")) - } - - return object -} - -func (t CollationsType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) { - if in.Type() == nil { - return NewCollationsValueNull(), nil - } - - if !in.Type().Equal(t.TerraformType(ctx)) { - return nil, fmt.Errorf("expected %s, got %s", t.TerraformType(ctx), in.Type()) - } - - if !in.IsKnown() { - return NewCollationsValueUnknown(), nil - } - - if in.IsNull() { - return NewCollationsValueNull(), nil - } - - attributes := map[string]attr.Value{} - - val := map[string]tftypes.Value{} - - err := in.As(&val) - - if err != nil { - return nil, err - } - - for k, v := range val { - a, err := t.AttrTypes[k].ValueFromTerraform(ctx, v) - - if err != nil { - return nil, err - } - - attributes[k] = a - } - - return NewCollationsValueMust(CollationsValue{}.AttributeTypes(ctx), attributes), nil -} - -func (t CollationsType) ValueType(ctx context.Context) attr.Value { - return CollationsValue{} -} - -var _ basetypes.ObjectValuable = CollationsValue{} - -type CollationsValue struct { - CollationName basetypes.StringValue `tfsdk:"collation_name"` - Description basetypes.StringValue `tfsdk:"description"` - state attr.ValueState -} - -func (v CollationsValue) ToTerraformValue(ctx context.Context) (tftypes.Value, error) { - attrTypes := make(map[string]tftypes.Type, 2) - - var val tftypes.Value - var err error - - attrTypes["collation_name"] = basetypes.StringType{}.TerraformType(ctx) - attrTypes["description"] = basetypes.StringType{}.TerraformType(ctx) - - objectType := tftypes.Object{AttributeTypes: attrTypes} - - switch v.state { - case attr.ValueStateKnown: - vals := make(map[string]tftypes.Value, 2) - - val, err = v.CollationName.ToTerraformValue(ctx) - - if err != nil { - return tftypes.NewValue(objectType, tftypes.UnknownValue), err - } - - vals["collation_name"] = val - - val, err = v.Description.ToTerraformValue(ctx) - - if err != nil { - return tftypes.NewValue(objectType, tftypes.UnknownValue), err - } - - vals["description"] = val - - if err := tftypes.ValidateValue(objectType, vals); err != nil { - return tftypes.NewValue(objectType, tftypes.UnknownValue), err - } - - return tftypes.NewValue(objectType, vals), nil - case attr.ValueStateNull: - return tftypes.NewValue(objectType, nil), nil - case attr.ValueStateUnknown: - return tftypes.NewValue(objectType, tftypes.UnknownValue), nil - default: - panic(fmt.Sprintf("unhandled Object state in ToTerraformValue: %s", v.state)) - } -} - -func (v CollationsValue) IsNull() bool { - return v.state == attr.ValueStateNull -} - -func (v CollationsValue) IsUnknown() bool { - return v.state == attr.ValueStateUnknown -} - -func (v CollationsValue) String() string { - return "CollationsValue" -} - -func (v CollationsValue) ToObjectValue(ctx context.Context) (basetypes.ObjectValue, diag.Diagnostics) { - var diags diag.Diagnostics - - attributeTypes := map[string]attr.Type{ - "collation_name": basetypes.StringType{}, - "description": basetypes.StringType{}, - } - - if v.IsNull() { - return types.ObjectNull(attributeTypes), diags - } - - if v.IsUnknown() { - return types.ObjectUnknown(attributeTypes), diags - } - - objVal, diags := types.ObjectValue( - attributeTypes, - map[string]attr.Value{ - "collation_name": v.CollationName, - "description": v.Description, - }) - - return objVal, diags -} - -func (v CollationsValue) Equal(o attr.Value) bool { - other, ok := o.(CollationsValue) - - if !ok { - return false - } - - if v.state != other.state { - return false - } - - if v.state != attr.ValueStateKnown { - return true - } - - if !v.CollationName.Equal(other.CollationName) { - return false - } - - if !v.Description.Equal(other.Description) { - return false - } - - return true -} - -func (v CollationsValue) Type(ctx context.Context) attr.Type { - return CollationsType{ - basetypes.ObjectType{ - AttrTypes: v.AttributeTypes(ctx), - }, - } -} - -func (v CollationsValue) AttributeTypes(ctx context.Context) map[string]attr.Type { - return map[string]attr.Type{ - "collation_name": basetypes.StringType{}, - "description": basetypes.StringType{}, - } -} diff --git a/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/database_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/database_data_source_gen.go index e7afd007..92b1064e 100644 --- a/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/database_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/database_data_source_gen.go @@ -61,7 +61,6 @@ func DatabaseDataSourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/databases_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/databases_data_source_gen.go index abf028f3..71ec8fb4 100644 --- a/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/databases_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/database/datasources_gen/databases_data_source_gen.go @@ -102,7 +102,6 @@ func DatabasesDataSourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/database/resource.go b/stackit/internal/services/sqlserverflexbeta/database/resource.go index b8d07540..b8ed1cad 100644 --- a/stackit/internal/services/sqlserverflexbeta/database/resource.go +++ b/stackit/internal/services/sqlserverflexbeta/database/resource.go @@ -193,7 +193,6 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques data.Owner.ValueString(), ). SetSleepBeforeWait(10 * time.Second). - SetTimeout(90 * time.Minute). WaitWithContext(ctx) if err != nil { core.LogAndAddError( @@ -254,9 +253,9 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques region, databaseName, ).SetSleepBeforeWait( - 10 * time.Second, + 30 * time.Second, ).SetTimeout( - 90 * time.Minute, + 15 * time.Minute, ).WaitWithContext(ctx) if err != nil { core.LogAndAddError( diff --git a/stackit/internal/services/sqlserverflexbeta/database/resources_gen/database_resource_gen.go b/stackit/internal/services/sqlserverflexbeta/database/resources_gen/database_resource_gen.go index d7cd3611..dccae0c4 100644 --- a/stackit/internal/services/sqlserverflexbeta/database/resources_gen/database_resource_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/database/resources_gen/database_resource_gen.go @@ -77,7 +77,6 @@ func DatabaseResourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/flavors/datasources_gen/flavors_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/flavors/datasources_gen/flavors_data_source_gen.go index 38f301ef..a9d35ba1 100644 --- a/stackit/internal/services/sqlserverflexbeta/flavors/datasources_gen/flavors_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/flavors/datasources_gen/flavors_data_source_gen.go @@ -135,7 +135,6 @@ func FlavorsDataSourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instance_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instance_data_source_gen.go index cd943be7..f3226581 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instance_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instance_data_source_gen.go @@ -126,7 +126,6 @@ func InstanceDataSourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instances_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instances_data_source_gen.go index b593acef..04fff1f6 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instances_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen/instances_data_source_gen.go @@ -95,7 +95,6 @@ func InstancesDataSourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/instance/flavor_functions.go b/stackit/internal/services/sqlserverflexbeta/instance/flavor_functions.go deleted file mode 100644 index 7b856dbf..00000000 --- a/stackit/internal/services/sqlserverflexbeta/instance/flavor_functions.go +++ /dev/null @@ -1,65 +0,0 @@ -package sqlserverflexbeta - -import ( - "context" - "fmt" - - "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3beta1api" -) - -type flavorsClientReader interface { - GetFlavorsRequest( - ctx context.Context, - projectId, region string, - ) v3beta1api.ApiGetFlavorsRequestRequest -} - -func getAllFlavors(ctx context.Context, client flavorsClientReader, projectId, region string) ( - []v3beta1api.ListFlavors, - error, -) { - getAllFilter := func(_ v3beta1api.ListFlavors) bool { return true } - flavorList, err := getFlavorsByFilter(ctx, client, projectId, region, getAllFilter) - if err != nil { - return nil, err - } - return flavorList, nil -} - -// getFlavorsByFilter is a helper function to retrieve flavors using a filtern function. -// Hint: The API does not have a GetFlavors endpoint, only ListFlavors -func getFlavorsByFilter( - ctx context.Context, - client flavorsClientReader, - projectId, region string, - filter func(db v3beta1api.ListFlavors) bool, -) ([]v3beta1api.ListFlavors, error) { - if projectId == "" || region == "" { - return nil, fmt.Errorf("listing v3beta1api flavors: projectId and region are required") - } - - const pageSize = 25 - - var result = make([]v3beta1api.ListFlavors, 0) - - for page := int64(1); ; page++ { - res, err := client.GetFlavorsRequest(ctx, projectId, region). - Page(page).Size(pageSize).Sort(v3beta1api.FLAVORSORT_INDEX_ASC).Execute() - if err != nil { - return nil, fmt.Errorf("requesting flavors list (page %d): %w", page, err) - } - - // If the API returns no flavors, we have reached the end of the list. - if len(res.Flavors) == 0 { - break - } - - for _, flavor := range res.Flavors { - if filter(flavor) { - result = append(result, flavor) - } - } - } - - return result, nil -} diff --git a/stackit/internal/services/sqlserverflexbeta/instance/functions.go b/stackit/internal/services/sqlserverflexbeta/instance/functions.go index 1674e0e0..18ad8dc0 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/functions.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/functions.go @@ -11,8 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" - "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils" - "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3beta1api" sqlserverflexbetaDataGen "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/instance/datasources_gen" @@ -22,14 +20,14 @@ import ( func mapResponseToModel( ctx context.Context, resp *v3beta1api.GetInstanceResponse, - m *LocalInstanceModel, + m *sqlserverflexbetaResGen.InstanceModel, tfDiags diag.Diagnostics, ) error { m.BackupSchedule = types.StringValue(resp.GetBackupSchedule()) m.Edition = types.StringValue(string(resp.GetEdition())) m.Encryption = handleEncryption(ctx, m, resp) m.FlavorId = types.StringValue(resp.GetFlavorId()) - m.Id = utils.BuildInternalTerraformId(m.ProjectId.ValueString(), m.Region.ValueString(), resp.GetId()) + m.Id = types.StringValue(resp.GetId()) m.InstanceId = types.StringValue(resp.GetId()) m.IsDeletable = types.BoolValue(resp.GetIsDeletable()) m.Name = types.StringValue(resp.GetName()) @@ -133,7 +131,7 @@ func mapDataResponseToModel( func handleEncryption( ctx context.Context, - m *LocalInstanceModel, + m *sqlserverflexbetaResGen.InstanceModel, resp *v3beta1api.GetInstanceResponse, ) sqlserverflexbetaResGen.EncryptionValue { if !resp.HasEncryption() || @@ -191,7 +189,7 @@ func handleDSEncryption( func toCreatePayload( ctx context.Context, - model *LocalInstanceModel, + model *sqlserverflexbetaResGen.InstanceModel, ) (*v3beta1api.CreateInstanceRequestPayload, error) { if model == nil { return nil, fmt.Errorf("nil model") @@ -241,7 +239,7 @@ func toCreatePayload( func toUpdatePayload( ctx context.Context, - m *LocalInstanceModel, + m *sqlserverflexbetaResGen.InstanceModel, resp *resource.UpdateResponse, ) (*v3beta1api.UpdateInstanceRequestPayload, error) { if m == nil { diff --git a/stackit/internal/services/sqlserverflexbeta/instance/functions_test.go b/stackit/internal/services/sqlserverflexbeta/instance/functions_test.go index 06477209..03380d5d 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/functions_test.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/functions_test.go @@ -40,7 +40,7 @@ func Test_handleDSEncryption(t *testing.T) { func Test_handleEncryption(t *testing.T) { type args struct { - m *LocalInstanceModel + m *sqlserverflexbetaRs.InstanceModel resp *sqlserverflexbetaPkgGen.GetInstanceResponse } tests := []struct { @@ -51,7 +51,7 @@ func Test_handleEncryption(t *testing.T) { { name: "nil response", args: args{ - m: &LocalInstanceModel{}, + m: &sqlserverflexbetaRs.InstanceModel{}, resp: &sqlserverflexbetaPkgGen.GetInstanceResponse{}, }, want: sqlserverflexbetaRs.EncryptionValue{}, @@ -59,7 +59,7 @@ func Test_handleEncryption(t *testing.T) { { name: "nil response", args: args{ - m: &LocalInstanceModel{}, + m: &sqlserverflexbetaRs.InstanceModel{}, resp: &sqlserverflexbetaPkgGen.GetInstanceResponse{ Encryption: &sqlserverflexbetaPkgGen.InstanceEncryption{}, }, @@ -69,7 +69,7 @@ func Test_handleEncryption(t *testing.T) { { name: "response with values", args: args{ - m: &LocalInstanceModel{}, + m: &sqlserverflexbetaRs.InstanceModel{}, resp: &sqlserverflexbetaPkgGen.GetInstanceResponse{ Encryption: &sqlserverflexbetaPkgGen.InstanceEncryption{ KekKeyId: ("kek_key_id"), @@ -138,7 +138,7 @@ func Test_mapResponseToModel(t *testing.T) { type args struct { ctx context.Context resp *sqlserverflexbetaPkgGen.GetInstanceResponse - m *LocalInstanceModel + m *sqlserverflexbetaRs.InstanceModel tfDiags diag.Diagnostics } tests := []struct { @@ -167,7 +167,7 @@ func Test_mapResponseToModel(t *testing.T) { func Test_toCreatePayload(t *testing.T) { type args struct { ctx context.Context - model *LocalInstanceModel + model *sqlserverflexbetaRs.InstanceModel } tests := []struct { name string @@ -175,61 +175,61 @@ func Test_toCreatePayload(t *testing.T) { want *sqlserverflexbetaPkgGen.CreateInstanceRequestPayload wantErr bool }{ - //{ - // name: "simple", - // args: args{ - // ctx: context.Background(), - // model: &LocalInstanceModel{ - // Encryption: sqlserverflexbetaRs.NewEncryptionValueMust( - // sqlserverflexbetaRs.EncryptionValue{}.AttributeTypes(context.Background()), - // map[string]attr.Value{ - // "kek_key_id": types.StringValue("kek_key_id"), - // "kek_key_ring_id": types.StringValue("kek_key_ring_id"), - // "kek_key_version": types.StringValue("kek_key_version"), - // "service_account": types.StringValue("sacc"), - // }, - // ), - // Storage: sqlserverflexbetaRs.StorageValue{}, - // }, - // }, - // want: &sqlserverflexbetaPkgGen.CreateInstanceRequestPayload{ - // BackupSchedule: "", - // Encryption: &sqlserverflexbetaPkgGen.InstanceEncryption{ - // KekKeyId: ("kek_key_id"), - // KekKeyRingId: ("kek_key_ring_id"), - // KekKeyVersion: ("kek_key_version"), - // ServiceAccount: ("sacc"), - // }, - // FlavorId: "", - // Name: "", - // Network: sqlserverflexbetaPkgGen.CreateInstanceRequestPayloadNetwork{}, - // RetentionDays: 0, - // Storage: sqlserverflexbetaPkgGen.StorageCreate{}, - // Version: "", - // }, - // wantErr: false, - //}, - //{ - // name: "nil object", - // args: args{ - // ctx: context.Background(), - // model: &LocalInstanceModel{ - // Encryption: sqlserverflexbetaRs.NewEncryptionValueNull(), - // Storage: sqlserverflexbetaRs.StorageValue{}, - // }, - // }, - // want: &sqlserverflexbetaPkgGen.CreateInstanceRequestPayload{ - // BackupSchedule: "", - // Encryption: nil, - // FlavorId: "", - // Name: "", - // Network: sqlserverflexbetaPkgGen.CreateInstanceRequestPayloadNetwork{}, - // RetentionDays: 0, - // Storage: sqlserverflexbetaPkgGen.StorageCreate{}, - // Version: "", - // }, - // wantErr: false, - //}, + { + name: "simple", + args: args{ + ctx: context.Background(), + model: &sqlserverflexbetaRs.InstanceModel{ + Encryption: sqlserverflexbetaRs.NewEncryptionValueMust( + sqlserverflexbetaRs.EncryptionValue{}.AttributeTypes(context.Background()), + map[string]attr.Value{ + "kek_key_id": types.StringValue("kek_key_id"), + "kek_key_ring_id": types.StringValue("kek_key_ring_id"), + "kek_key_version": types.StringValue("kek_key_version"), + "service_account": types.StringValue("sacc"), + }, + ), + Storage: sqlserverflexbetaRs.StorageValue{}, + }, + }, + want: &sqlserverflexbetaPkgGen.CreateInstanceRequestPayload{ + BackupSchedule: "", + Encryption: &sqlserverflexbetaPkgGen.InstanceEncryption{ + KekKeyId: ("kek_key_id"), + KekKeyRingId: ("kek_key_ring_id"), + KekKeyVersion: ("kek_key_version"), + ServiceAccount: ("sacc"), + }, + FlavorId: "", + Name: "", + Network: sqlserverflexbetaPkgGen.CreateInstanceRequestPayloadNetwork{}, + RetentionDays: 0, + Storage: sqlserverflexbetaPkgGen.StorageCreate{}, + Version: "", + }, + wantErr: false, + }, + { + name: "nil object", + args: args{ + ctx: context.Background(), + model: &sqlserverflexbetaRs.InstanceModel{ + Encryption: sqlserverflexbetaRs.NewEncryptionValueNull(), + Storage: sqlserverflexbetaRs.StorageValue{}, + }, + }, + want: &sqlserverflexbetaPkgGen.CreateInstanceRequestPayload{ + BackupSchedule: "", + Encryption: nil, + FlavorId: "", + Name: "", + Network: sqlserverflexbetaPkgGen.CreateInstanceRequestPayloadNetwork{}, + RetentionDays: 0, + Storage: sqlserverflexbetaPkgGen.StorageCreate{}, + Version: "", + }, + wantErr: false, + }, } for _, tt := range tests { t.Run( @@ -250,7 +250,7 @@ func Test_toCreatePayload(t *testing.T) { func Test_toUpdatePayload(t *testing.T) { type args struct { ctx context.Context - m *LocalInstanceModel + m *sqlserverflexbetaRs.InstanceModel resp *resource.UpdateResponse } tests := []struct { diff --git a/stackit/internal/services/sqlserverflexbeta/instance/resource.go b/stackit/internal/services/sqlserverflexbeta/instance/resource.go index e61091cf..a824aabf 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/resource.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/resource.go @@ -10,10 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-plugin-framework/resource/schema" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/identityschema" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" @@ -34,6 +32,7 @@ var ( _ resource.ResourceWithConfigure = &instanceResource{} _ resource.ResourceWithImportState = &instanceResource{} _ resource.ResourceWithModifyPlan = &instanceResource{} + _ resource.ResourceWithIdentity = &instanceResource{} ) func NewInstanceResource() resource.Resource { @@ -45,18 +44,13 @@ type instanceResource struct { providerData core.ProviderData } -// LocalInstanceModel describes the resource data model. -type LocalInstanceModel struct { - sqlserverflexbetaResGen.InstanceModel - Flavor types.Object `tfsdk:"flavor"` -} +// resourceModel describes the resource data model. +type resourceModel = sqlserverflexbetaResGen.InstanceModel -// LocalFlavorModel Struct corresponding to Model.Flavor -type LocalFlavorModel struct { - Id types.String `tfsdk:"id"` - Description types.String `tfsdk:"description"` - CPU types.Int64 `tfsdk:"cpu"` - RAM types.Int64 `tfsdk:"ram"` +type InstanceResourceIdentityModel struct { + ProjectID types.String `tfsdk:"project_id"` + Region types.String `tfsdk:"region"` + InstanceID types.String `tfsdk:"instance_id"` } func (r *instanceResource) Metadata( @@ -70,40 +64,8 @@ func (r *instanceResource) Metadata( //go:embed planModifiers.yaml var modifiersFileByte []byte -func (r *instanceResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { +func (r *instanceResource) Schema(ctx context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { s := sqlserverflexbetaResGen.InstanceResourceSchema(ctx) - s.Attributes["flavor"] = schema.SingleNestedAttribute{ - Optional: true, - DeprecationMessage: "Please use flavor_id instead.", - Attributes: map[string]schema.Attribute{ - "id": schema.StringAttribute{ - Computed: true, - PlanModifiers: []planmodifier.String{ - UseStateForUnknownIfFlavorUnchanged(req), - }, - }, - "description": schema.StringAttribute{ - Computed: true, - PlanModifiers: []planmodifier.String{ - UseStateForUnknownIfFlavorUnchanged(req), - }, - }, - "cpu": schema.Int64Attribute{ - DeprecationMessage: "Please use flavor_id instead.", - Optional: true, - }, - "ram": schema.Int64Attribute{ - DeprecationMessage: "Please use flavor_id instead.", - Optional: true, - }, - }, - } - - s.Attributes["flavor_id"] = schema.StringAttribute{ - Optional: true, - Description: "The id of the instance flavor.", - MarkdownDescription: "The id of the instance flavor.", - } fields, err := utils.ReadModifiersConfig(modifiersFileByte) if err != nil { @@ -119,6 +81,26 @@ func (r *instanceResource) Schema(ctx context.Context, req resource.SchemaReques resp.Schema = s } +func (r *instanceResource) IdentitySchema( + _ context.Context, + _ resource.IdentitySchemaRequest, + resp *resource.IdentitySchemaResponse, +) { + resp.IdentitySchema = identityschema.Schema{ + Attributes: map[string]identityschema.Attribute{ + "project_id": identityschema.StringAttribute{ + RequiredForImport: true, // must be set during import by the practitioner + }, + "region": identityschema.StringAttribute{ + RequiredForImport: true, // can be defaulted by the provider configuration + }, + "instance_id": identityschema.StringAttribute{ + RequiredForImport: true, // can be defaulted by the provider configuration + }, + }, + } +} + // Configure adds the provider configured client to the resource. func (r *instanceResource) Configure( ctx context.Context, @@ -169,7 +151,7 @@ func (r *instanceResource) ModifyPlan( if req.Config.Raw.IsNull() { return } - var configModel LocalInstanceModel + var configModel resourceModel resp.Diagnostics.Append(req.Config.Get(ctx, &configModel)...) if resp.Diagnostics.HasError() { return @@ -178,7 +160,7 @@ func (r *instanceResource) ModifyPlan( if req.Plan.Raw.IsNull() { return } - var planModel LocalInstanceModel + var planModel resourceModel resp.Diagnostics.Append(req.Plan.Get(ctx, &planModel)...) if resp.Diagnostics.HasError() { return @@ -196,7 +178,7 @@ func (r *instanceResource) ModifyPlan( } func (r *instanceResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - var data LocalInstanceModel + var data resourceModel crateErr := "[SQL Server Flex BETA - Create] error" // Read Terraform plan data into the model @@ -208,78 +190,11 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques ctx = core.InitProviderContext(ctx) - projectID := data.ProjectId.ValueString() + projectId := data.ProjectId.ValueString() region := data.Region.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) + ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "region", region) - // determine flavor ID - var flModel = &LocalFlavorModel{} - if !(data.Flavor.IsNull() || data.Flavor.IsUnknown()) { - diags := data.Flavor.As(ctx, flModel, basetypes.ObjectAsOptions{}) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - - flavors, err := getAllFlavors(ctx, r.client.DefaultAPI, projectID, region) - if err != nil { - core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading flavors", fmt.Sprintf("getAllFlavors: %v", err)) - return - } - tflog.Debug(ctx, fmt.Sprintf("loaded flavors: %d", len(flavors))) - - var foundFlavors []v3beta1api.ListFlavors - for _, flavor := range flavors { - if flModel.CPU.ValueInt64() != int64(flavor.Cpu) { - // tflog.Debug(ctx, fmt.Sprintf("flavor - cpu did not match (%d - %d)", flModel.CPU.ValueInt64(), flavor.Cpu)) - continue - } - if flModel.RAM.ValueInt64() != int64(flavor.Memory) { - // tflog.Debug(ctx, fmt.Sprintf("flavor - ram did not match (%d - %d)", flModel.RAM.ValueInt64(), flavor.Memory)) - continue - } - tmpNodeType := "Single" - if data.Replicas.ValueInt64() > 1 { - tmpNodeType = "Replica" - } - if strings.ToLower(tmpNodeType) != strings.ToLower(flavor.NodeType) { - //tflog.Debug( - // ctx, - // fmt.Sprintf( - // "flavor - nodeType did not match ('%s' - '%s')", - // strings.ToLower(tmpNodeType), - // strings.ToLower(flavor.NodeType), - // ), - //) - continue - } - tflog.Debug(ctx, fmt.Sprintf("found flavor %s, checking storage classes", flavor.Id)) - for _, sc := range flavor.StorageClasses { - if data.Storage.Class.ValueString() != sc.Class { - continue - } - tflog.Debug(ctx, fmt.Sprintf("found storage class '%s' for flavor '%s', checking storage classes", sc.Class, flavor.Id)) - foundFlavors = append(foundFlavors, flavor) - } - } - if len(foundFlavors) == 0 { - resp.Diagnostics.AddError("get flavor", "could not find requested flavor") - return - } - if len(foundFlavors) > 1 { - resp.Diagnostics.AddError("get flavor", "found too many matching flavors") - return - } - - f := foundFlavors[0] - flModel.Description = types.StringValue(f.Description) - flModel.Id = utils.BuildInternalTerraformId(data.ProjectId.ValueString(), region, f.Id) - data.FlavorId = types.StringValue(f.Id) - //flModel. .MaxGb = types.Int32Value(f.MaxGB) - //flModel.MinGb = types.Int32Value(f.MinGB) - } - // Generate API request body from model payload, err := toCreatePayload(ctx, &data) if err != nil { @@ -295,7 +210,7 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques // Create new Instance createResp, err := r.client.DefaultAPI.CreateInstanceRequest( ctx, - projectID, + projectId, region, ).CreateInstanceRequestPayload(*payload).Execute() if err != nil { @@ -305,25 +220,24 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques ctx = core.LogResponse(ctx) - instanceID := createResp.Id - data.InstanceId = types.StringValue(instanceID) - data.Id = utils.BuildInternalTerraformId(projectID, region, instanceID) + instanceId := createResp.Id + data.InstanceId = types.StringValue(instanceId) - // Set data returned by API in id - resp.Diagnostics.Append( - resp.State.SetAttribute( - ctx, - path.Root("id"), - utils.BuildInternalTerraformId(projectID, region, instanceID), - )..., - ) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), instanceID)...) + identity := InstanceResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } waitResp, err := wait.CreateInstanceWaitHandler( ctx, r.client.DefaultAPI, - projectID, - instanceID, + projectId, + instanceId, region, ).SetSleepBeforeWait( 10 * time.Second, @@ -369,7 +283,7 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques } func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - var data LocalInstanceModel + var data resourceModel // Read Terraform prior state data into the model resp.Diagnostics.Append(req.State.Get(ctx, &data)...) @@ -379,15 +293,15 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r ctx = core.InitProviderContext(ctx) - projectID := data.ProjectId.ValueString() + projectId := data.ProjectId.ValueString() region := data.Region.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) + ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "region", region) - instanceID := data.InstanceId.ValueString() - ctx = tflog.SetField(ctx, "instance_id", instanceID) + instanceId := data.InstanceId.ValueString() + ctx = tflog.SetField(ctx, "instance_id", instanceId) - instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped if ok && oapiErr.StatusCode == http.StatusNotFound { @@ -412,6 +326,17 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r return } + // Save identity into Terraform state + identity := InstanceResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + // Save updated data into Terraform state resp.Diagnostics.Append(resp.State.Set(ctx, &data)...) if resp.Diagnostics.HasError() { @@ -422,7 +347,7 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r } func (r *instanceResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - var data LocalInstanceModel + var data resourceModel updateInstanceError := "Error updating instance" resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...) @@ -432,13 +357,13 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques ctx = core.InitProviderContext(ctx) - projectID := data.ProjectId.ValueString() + projectId := data.ProjectId.ValueString() region := data.Region.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) + ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "region", region) - instanceID := data.InstanceId.ValueString() - ctx = tflog.SetField(ctx, "instance_id", instanceID) + instanceId := data.InstanceId.ValueString() + ctx = tflog.SetField(ctx, "instance_id", instanceId) // Generate API request body from model payload, err := toUpdatePayload(ctx, &data, resp) @@ -454,9 +379,9 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques // Update existing instance err = r.client.DefaultAPI.UpdateInstanceRequest( ctx, - projectID, + projectId, region, - instanceID, + instanceId, ).UpdateInstanceRequestPayload(*payload).Execute() if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, updateInstanceError, err.Error()) @@ -466,9 +391,9 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques ctx = core.LogResponse(ctx) waitResp, err := wait. - UpdateInstanceWaitHandler(ctx, r.client.DefaultAPI, projectID, instanceID, region). - SetSleepBeforeWait(10 * time.Second). - SetTimeout(90 * time.Minute). + UpdateInstanceWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region). + SetSleepBeforeWait(15 * time.Second). + SetTimeout(45 * time.Minute). WaitWithContext(ctx) if err != nil { core.LogAndAddError( @@ -492,6 +417,16 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques return } + identity := InstanceResourceIdentityModel{ + ProjectID: types.StringValue(projectId), + Region: types.StringValue(region), + InstanceID: types.StringValue(instanceId), + } + resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...) + if resp.Diagnostics.HasError() { + return + } + // Save updated data into Terraform state resp.Diagnostics.Append(resp.State.Set(ctx, &data)...) if resp.Diagnostics.HasError() { @@ -502,7 +437,7 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques } func (r *instanceResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - var data LocalInstanceModel + var data resourceModel // Read Terraform prior state data into the model resp.Diagnostics.Append(req.State.Get(ctx, &data)...) @@ -510,18 +445,25 @@ func (r *instanceResource) Delete(ctx context.Context, req resource.DeleteReques return } + // Read identity data + var identityData InstanceResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } + ctx = core.InitProviderContext(ctx) - projectID := data.ProjectId.ValueString() - region := data.Region.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) + projectId := identityData.ProjectID.ValueString() + region := identityData.Region.ValueString() + ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "region", region) - instanceID := data.InstanceId.ValueString() - ctx = tflog.SetField(ctx, "instance_id", instanceID) + instanceId := identityData.InstanceID.ValueString() + ctx = tflog.SetField(ctx, "instance_id", instanceId) // Delete existing instance - err := r.client.DefaultAPI.DeleteInstanceRequest(ctx, projectID, region, instanceID).Execute() + err := r.client.DefaultAPI.DeleteInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting instance", fmt.Sprintf("Calling API: %v", err)) return @@ -529,10 +471,7 @@ func (r *instanceResource) Delete(ctx context.Context, req resource.DeleteReques ctx = core.LogResponse(ctx) - delResp, err := wait.DeleteInstanceWaitHandler(ctx, r.client.DefaultAPI, projectID, instanceID, region). - SetSleepBeforeWait(10 * time.Second). - SetTimeout(90 * time.Minute). - WaitWithContext(ctx) + delResp, err := wait.DeleteInstanceWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region).WaitWithContext(ctx) if err != nil { core.LogAndAddError( ctx, @@ -567,24 +506,41 @@ func (r *instanceResource) ImportState( ) { ctx = core.InitProviderContext(ctx) - idParts := strings.Split(req.ID, core.Separator) + if req.ID != "" { + idParts := strings.Split(req.ID, core.Separator) - if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" { - core.LogAndAddError( - ctx, &resp.Diagnostics, - "Error importing instance", - fmt.Sprintf( - "Expected import identifier with format [project_id],[region],[instance_id] Got: %q", - req.ID, - ), - ) + if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" { + core.LogAndAddError( + ctx, &resp.Diagnostics, + "Error importing instance", + fmt.Sprintf( + "Expected import identifier with format [project_id],[region],[instance_id] Got: %q", + req.ID, + ), + ) + return + } + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) return } - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("id"), utils.BuildInternalTerraformId(idParts...).ValueString())...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) + // If no ID is provided, attempt to read identity attributes from the import configuration + var identityData InstanceResourceIdentityModel + resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...) + if resp.Diagnostics.HasError() { + return + } + + projectId := identityData.ProjectID.ValueString() + region := identityData.Region.ValueString() + instanceId := identityData.InstanceID.ValueString() + + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), projectId)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), region)...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), instanceId)...) tflog.Info(ctx, "Sqlserverflexbeta instance state imported") } diff --git a/stackit/internal/services/sqlserverflexbeta/instance/resources_gen/instance_resource_gen.go b/stackit/internal/services/sqlserverflexbeta/instance/resources_gen/instance_resource_gen.go index 7ea750c6..f8865ae5 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/resources_gen/instance_resource_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/resources_gen/instance_resource_gen.go @@ -139,7 +139,6 @@ func InstanceResourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go b/stackit/internal/services/sqlserverflexbeta/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go deleted file mode 100644 index c944f921..00000000 --- a/stackit/internal/services/sqlserverflexbeta/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go +++ /dev/null @@ -1,85 +0,0 @@ -package sqlserverflexbeta - -import ( - "context" - - "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" -) - -type useStateForUnknownIfFlavorUnchangedModifier struct { - Req resource.SchemaRequest -} - -// UseStateForUnknownIfFlavorUnchanged returns a plan modifier similar to UseStateForUnknown -// if the RAM and CPU values are not changed in the plan. Otherwise, the plan modifier does nothing. -func UseStateForUnknownIfFlavorUnchanged(req resource.SchemaRequest) planmodifier.String { - return useStateForUnknownIfFlavorUnchangedModifier{ - Req: req, - } -} - -func (m useStateForUnknownIfFlavorUnchangedModifier) Description(context.Context) string { - return "UseStateForUnknownIfFlavorUnchanged returns a plan modifier similar to UseStateForUnknown if the RAM and CPU values are not changed in the plan. Otherwise, the plan modifier does nothing." -} - -func (m useStateForUnknownIfFlavorUnchangedModifier) MarkdownDescription(ctx context.Context) string { - return m.Description(ctx) -} - -func (m useStateForUnknownIfFlavorUnchangedModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) { // nolint:gocritic // function signature required by Terraform - // Do nothing if there is no state value. - if req.StateValue.IsNull() { - return - } - - // Do nothing if there is a known planned value. - if !req.PlanValue.IsUnknown() { - return - } - - // Do nothing if there is an unknown configuration value, otherwise interpolation gets messed up. - if req.ConfigValue.IsUnknown() { - return - } - - // The above checks are taken from the UseStateForUnknown plan modifier implementation - // (https://github.com/hashicorp/terraform-plugin-framework/blob/main/resource/schema/stringplanmodifier/use_state_for_unknown.go#L38) - - var stateModel LocalInstanceModel - diags := req.State.Get(ctx, &stateModel) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - - var stateFlavor = &LocalFlavorModel{} - if !(stateModel.Flavor.IsNull() || stateModel.Flavor.IsUnknown()) { - diags = stateModel.Flavor.As(ctx, stateFlavor, basetypes.ObjectAsOptions{}) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - } - - var planModel LocalInstanceModel - diags = req.Plan.Get(ctx, &planModel) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - - var planFlavor = &LocalFlavorModel{} - if !(planModel.Flavor.IsNull() || planModel.Flavor.IsUnknown()) { - diags = planModel.Flavor.As(ctx, planFlavor, basetypes.ObjectAsOptions{}) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } - } - - if planFlavor.CPU == stateFlavor.CPU && planFlavor.RAM == stateFlavor.RAM { - resp.PlanValue = req.StateValue - } -} diff --git a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go index fae56505..c12bfa5d 100644 --- a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go +++ b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go @@ -3,32 +3,13 @@ package sqlserverflexbeta_test import ( "context" _ "embed" - "errors" "fmt" - "log" - "net/http" "os" "strconv" - "strings" "testing" - "time" - "github.com/hashicorp/terraform-plugin-testing/compare" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/knownvalue" - "github.com/hashicorp/terraform-plugin-testing/plancheck" - "github.com/hashicorp/terraform-plugin-testing/statecheck" - "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" - "github.com/stackitcloud/stackit-sdk-go/core/config" - "github.com/stackitcloud/stackit-sdk-go/core/oapierror" - "github.com/stackitcloud/stackit-sdk-go/core/utils" - - "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core" - wait "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/sqlserverflexbeta" - - "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3beta1api" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/internal/testutils" sqlserverflexbeta "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/instance" @@ -39,7 +20,7 @@ import ( fwresource "github.com/hashicorp/terraform-plugin-framework/resource" ) -const pfx = "stackitprivatepreview_sqlserverflexbeta" +const providerPrefix = "stackitprivatepreview_sqlserverflexbeta" func TestInstanceResourceSchema(t *testing.T) { t.Parallel() @@ -78,20 +59,20 @@ func testAccPreCheck(t *testing.T) { type resData struct { ServiceAccountFilePath string - ProjectID string + ProjectId string Region string Name string TfName string - FlavorID string + FlavorId string BackupSchedule string UseEncryption bool - KekKeyID string - KekKeyRingID string + KekKeyId string + KekKeyRingId string KekKeyVersion uint8 KekServiceAccount string PerformanceClass string Size uint32 - ACLStrings []string + AclString string AccessScope string RetentionDays uint32 Version string @@ -101,33 +82,37 @@ type resData struct { type User struct { Name string - ProjectID string + ProjectId string Roles []string } type Database struct { Name string - ProjectID string + ProjectId string Owner string Collation string Compatibility string } +func resName(res, name string) string { + return fmt.Sprintf("%s_%s.%s", providerPrefix, res, name) +} + func getExample() resData { name := acctest.RandomWithPrefix("tf-acc") return resData{ Region: os.Getenv("TF_ACC_REGION"), ServiceAccountFilePath: os.Getenv("TF_ACC_SERVICE_ACCOUNT_FILE"), - ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), Name: name, TfName: name, - FlavorID: "4.16-Single", + FlavorId: "4.16-Single", BackupSchedule: "0 0 * * *", UseEncryption: false, RetentionDays: 33, PerformanceClass: "premium-perf2-stackit", Size: 10, - ACLStrings: []string{"0.0.0.0/0"}, + AclString: "0.0.0.0/0", AccessScope: "PUBLIC", Version: "2022", } @@ -142,172 +127,118 @@ func TestAccInstance(t *testing.T) { updSizeData := exData updSizeData.Size = 25 - testInstanceID := testutils.ResStr(pfx, "instance", exData.TfName) - - compareValuesSame := statecheck.CompareValue(compare.ValuesSame()) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), exData.TfName) + t.Logf(" ... working on instance %s", exData.TfName) }, - CheckDestroy: testAccCheckSQLServerFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "create and verify") - }, - // empty refresh plan - ExpectNonEmptyPlan: false, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", exData, ), - ConfigStateChecks: []statecheck.StateCheck{ - compareValuesSame.AddStateValue( - testInstanceID, - tfjsonpath.New("id"), - ), - statecheck.ExpectKnownValue( - testInstanceID, - tfjsonpath.New("is_deletable"), - knownvalue.Bool(true), - ), - }, - Check: defaultNoEncInstanceTestChecks(testInstanceID, exData), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(resName("instance", exData.TfName), "name", exData.Name), + resource.TestCheckResourceAttrSet(resName("instance", exData.TfName), "id"), + // TODO: check all fields + ), }, // Update name and verify { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "update name and verify") - }, - ExpectNonEmptyPlan: false, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", updNameData, ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectNonEmptyPlan(), - }, - }, Check: resource.ComposeTestCheckFunc( - defaultNoEncInstanceTestChecks(testInstanceID, updNameData), - ), - }, - // Expect empty plan after update - { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "expect empty plan") - }, - ExpectNonEmptyPlan: false, - Config: testutils.StringFromTemplateMust( - "testdata/instance_template.gompl", - updNameData, + resource.TestCheckResourceAttr(resName("instance", exData.TfName), "name", updNameData.Name), ), }, // Update size and verify { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "update storage.size and verify") - }, - ExpectNonEmptyPlan: false, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", updSizeData, ), Check: resource.ComposeTestCheckFunc( - defaultNoEncInstanceTestChecks(testInstanceID, updSizeData), + resource.TestCheckResourceAttr( + testutils.ResStr(providerPrefix, "instance", exData.TfName), + "storage.size", + strconv.Itoa(int(updSizeData.Size)), + ), ), }, - // Import test - // test instance imports { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "import instance") - }, - ResourceName: testInstanceID, - // ImportStateIdPrefix: "", - // ImportStateVerifyIdentifierAttribute: "id", - ImportStateIdFunc: getInstanceTestID(exData.TfName), - ImportStateKind: resource.ImportCommandWithID, - ImportState: true, - ImportStateVerify: true, + RefreshState: true, }, + //// Import test + //{ + // ResourceName: resName("instance", exData.TfName), + // ImportState: true, + // ImportStateVerify: true, + // }, }, }) } func TestAccInstanceReApply(t *testing.T) { exData := getExample() - testInstanceID := testutils.ResStr(pfx, "instance", exData.TfName) - compareValuesSame := statecheck.CompareValue(compare.ValuesSame()) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), exData.TfName) + t.Logf(" ... working on instance %s", exData.TfName) }, - CheckDestroy: testAccCheckSQLServerFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "create and verify") - }, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", exData, ), - ConfigStateChecks: []statecheck.StateCheck{ - compareValuesSame.AddStateValue( - testInstanceID, - tfjsonpath.New("id"), - ), - statecheck.ExpectKnownValue( - testInstanceID, - tfjsonpath.New("is_deletable"), - knownvalue.Bool(true), - ), - }, - Check: defaultNoEncInstanceTestChecks(testInstanceID, exData), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(resName("instance", exData.TfName), "name", exData.Name), + resource.TestCheckResourceAttrSet(resName("instance", exData.TfName), "id"), + // TODO: check all fields + ), }, - // Second apply should not have changes + // Create and verify { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "second apply") - }, - ExpectNonEmptyPlan: false, - ResourceName: testInstanceID, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", exData, ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectEmptyPlan(), - }, - }, - ConfigStateChecks: []statecheck.StateCheck{ - compareValuesSame.AddStateValue( - testInstanceID, - tfjsonpath.New("id"), - ), - statecheck.ExpectKnownValue( - testInstanceID, - tfjsonpath.New("is_deletable"), - knownvalue.Bool(true), - ), - }, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(resName("instance", exData.TfName), "name", exData.Name), + resource.TestCheckResourceAttrSet(resName("instance", exData.TfName), "id"), + // TODO: check all fields + ), }, - // Refresh state test { - PreConfig: func() { - t.Logf("testing: %s - %s", t.Name(), "refresh state") - }, RefreshState: true, }, + // Create and verify + { + Config: testutils.StringFromTemplateMust( + "testdata/instance_template.gompl", + exData, + ), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(resName("instance", exData.TfName), "name", exData.Name), + resource.TestCheckResourceAttrSet(resName("instance", exData.TfName), "id"), + // TODO: check all fields + ), + }, + // Import test + { + ResourceName: resName("instance", exData.TfName), + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportState: true, + // ImportStateVerify is not supported with plannable import blocks + // ImportStateVerify: true, + }, }, }) } @@ -320,7 +251,7 @@ func TestAccInstanceNoEncryption(t *testing.T) { data.Users = []User{ { Name: userName, - ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), Roles: []string{ "##STACKIT_DatabaseManager##", "##STACKIT_LoginManager##", @@ -334,19 +265,16 @@ func TestAccInstanceNoEncryption(t *testing.T) { data.Databases = []Database{ { Name: dbName, - ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), Owner: userName, }, } - testInstanceID := testutils.ResStr(pfx, "instance", data.TfName) - testDatabaseID := testutils.ResStr(pfx, "database", dbName) - testUserID := testutils.ResStr(pfx, "user", userName) + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), data.TfName) + t.Logf(" ... working on instance %s", data.TfName) }, - CheckDestroy: testAccCheckSQLServerFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify @@ -356,22 +284,62 @@ func TestAccInstanceNoEncryption(t *testing.T) { data, ), Check: resource.ComposeAggregateTestCheckFunc( - defaultNoEncInstanceTestChecks(testInstanceID, data), + // check instance values are set + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "id"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "backup_schedule"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "edition"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "flavor_id"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "instance_id"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "is_deletable"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "name"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "replicas"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "retention_days"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "status"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "version"), + + resource.TestCheckNoResourceAttr(resName("instance", data.TfName), "encryption"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_id"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_version"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_ring_id"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.service_account"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.access_scope"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.acl"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.instance_address"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.router_address"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.class"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"), + + // check instance values are correct + resource.TestCheckResourceAttr(resName("instance", data.TfName), "name", data.Name), + + // check user values are set + resource.TestCheckResourceAttrSet(resName("user", userName), "id"), + resource.TestCheckResourceAttrSet(resName("user", userName), "username"), + // resource.TestCheckResourceAttrSet(resName("user", userName), "roles"), + + // func(s *terraform.State) error { + // return nil + // }, // check user values are correct - resource.TestCheckResourceAttr(testUserID, "username", userName), - resource.TestCheckResourceAttr(testUserID, "roles.#", strconv.Itoa(len(data.Users[0].Roles))), + resource.TestCheckResourceAttr(resName("user", userName), "username", userName), + resource.TestCheckResourceAttr(resName("user", userName), "roles.#", strconv.Itoa(len(data.Users[0].Roles))), // check database values are set - resource.TestCheckResourceAttrSet(testDatabaseID, "id"), - resource.TestCheckResourceAttrSet(testDatabaseID, "name"), - resource.TestCheckResourceAttrSet(testDatabaseID, "owner"), - resource.TestCheckResourceAttrSet(testDatabaseID, "compatibility"), - resource.TestCheckResourceAttrSet(testDatabaseID, "collation"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "id"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "name"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "owner"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "compatibility"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "collation"), // check database values are correct - resource.TestCheckResourceAttr(testDatabaseID, "name", dbName), - resource.TestCheckResourceAttr(testDatabaseID, "owner", userName), + resource.TestCheckResourceAttr(resName("database", dbName), "name", dbName), + resource.TestCheckResourceAttr(resName("database", dbName), "owner", userName), ), }, }, @@ -386,34 +354,29 @@ func TestAccInstanceEncryption(t *testing.T) { data.Users = []User{ { Name: userName, - ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), Roles: []string{"##STACKIT_DatabaseManager##", "##STACKIT_LoginManager##"}, }, } data.Databases = []Database{ { Name: dbName, - ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), Owner: userName, }, } data.UseEncryption = true - data.KekKeyID = "fe039bcf-8d7b-431a-801d-9e81371a6b7b" - data.KekKeyRingID = "6a2d95ab-3c4c-4963-a2bb-08d17a320e27" + data.KekKeyId = "fe039bcf-8d7b-431a-801d-9e81371a6b7b" + data.KekKeyRingId = "6a2d95ab-3c4c-4963-a2bb-08d17a320e27" data.KekKeyVersion = 1 data.KekServiceAccount = "henselinm-u2v3ex1@sa.stackit.cloud" - testInstanceID := testutils.ResStr(pfx, "instance", data.TfName) - testDatabaseID := testutils.ResStr(pfx, "database", dbName) - testUserID := testutils.ResStr(pfx, "user", userName) - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) - t.Logf(" ... %s - %s", t.Name(), data.TfName) + t.Logf(" ... working on instance %s", data.TfName) }, - CheckDestroy: testAccCheckSQLServerFlexDestroy, ProtoV6ProviderFactories: testutils.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ // Create and verify @@ -423,296 +386,61 @@ func TestAccInstanceEncryption(t *testing.T) { data, ), Check: resource.ComposeAggregateTestCheckFunc( - defaultEncInstanceTestChecks(testInstanceID, data), + // check instance values are set + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "id"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "backup_schedule"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "edition"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "flavor_id"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "instance_id"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "is_deletable"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "name"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "replicas"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "retention_days"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "status"), + resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "version"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_id"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_version"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_ring_id"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.service_account"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.access_scope"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.acl"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.instance_address"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.router_address"), + + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.class"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"), + + // check instance values are correct + resource.TestCheckResourceAttr(resName("instance", data.TfName), "name", data.Name), // check user values are set - resource.TestCheckResourceAttrSet(testUserID, "id"), - resource.TestCheckResourceAttrSet(testUserID, "username"), + resource.TestCheckResourceAttrSet(resName("user", userName), "id"), + resource.TestCheckResourceAttrSet(resName("user", userName), "username"), // func(s *terraform.State) error { // return nil // }, // check user values are correct - resource.TestCheckResourceAttr(testUserID, "username", userName), - resource.TestCheckResourceAttr(testUserID, "roles.#", "2"), + resource.TestCheckResourceAttr(resName("user", userName), "username", userName), + resource.TestCheckResourceAttr(resName("user", userName), "roles.#", "2"), // check database values are set - resource.TestCheckResourceAttrSet(testDatabaseID, "id"), - resource.TestCheckResourceAttrSet(testDatabaseID, "name"), - resource.TestCheckResourceAttrSet(testDatabaseID, "owner"), - resource.TestCheckResourceAttrSet(testDatabaseID, "compatibility"), - resource.TestCheckResourceAttrSet(testDatabaseID, "collation"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "id"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "name"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "owner"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "compatibility"), + resource.TestCheckResourceAttrSet(resName("database", dbName), "collation"), // check database values are correct - resource.TestCheckResourceAttr(testDatabaseID, "name", dbName), - resource.TestCheckResourceAttr(testDatabaseID, "owner", userName), + resource.TestCheckResourceAttr(resName("database", dbName), "name", dbName), + resource.TestCheckResourceAttr(resName("database", dbName), "owner", userName), ), }, }, }) } - -func defaultNoEncInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - defaultInstanceTestChecks(testItemID, data), - - // check absent attr - resource.TestCheckNoResourceAttr(testItemID, "encryption"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_id"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_ring_id"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.kek_key_version"), - resource.TestCheckNoResourceAttr(testItemID, "encryption.service_account"), - ) -} - -func defaultEncInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - defaultInstanceTestChecks(testItemID, data), - - // check absent attr - resource.TestCheckResourceAttr(testItemID, "encryption.%", "4"), - resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_id"), - resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_id", data.KekKeyID), - resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_ring_id"), - resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_ring_id", data.KekKeyRingID), - resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_version"), - resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_version", strconv.Itoa(int(data.KekKeyVersion))), - resource.TestCheckResourceAttrSet(testItemID, "encryption.service_account"), - resource.TestCheckResourceAttr(testItemID, "encryption.service_account", data.KekServiceAccount), - ) -} - -func defaultInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - // if AccessScope == SNA these are set - if data.AccessScope == "SNA" { - return resource.ComposeAggregateTestCheckFunc( - basicInstanceTestChecks(testItemID, data), - resource.TestCheckResourceAttrSet(testItemID, "network.instance_address"), - resource.TestCheckResourceAttrSet(testItemID, "network.router_address"), - ) - } - - // if AccessScope == PUBLIC these are empty - but they are set - return resource.ComposeAggregateTestCheckFunc( - basicInstanceTestChecks(testItemID, data), - resource.TestCheckResourceAttr(testItemID, "network.instance_address", ""), - resource.TestCheckResourceAttr(testItemID, "network.router_address", ""), - ) -} - -func basicInstanceTestChecks(testItemID string, data resData) resource.TestCheckFunc { - return resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrSet(testItemID, "backup_schedule"), - resource.TestCheckResourceAttr(testItemID, "backup_schedule", data.BackupSchedule), - - resource.TestCheckResourceAttrSet(testItemID, "flavor_id"), - resource.TestCheckResourceAttr(testItemID, "flavor_id", data.FlavorID), - - resource.TestCheckResourceAttrSet(testItemID, "id"), - resource.TestCheckResourceAttrSet(testItemID, "instance_id"), - - resource.TestCheckResourceAttrSet(testItemID, "edition"), - - resource.TestCheckResourceAttrSet(testItemID, "is_deletable"), - resource.TestCheckResourceAttr(testItemID, "is_deletable", "true"), - - resource.TestCheckResourceAttrSet(testItemID, "name"), - resource.TestCheckResourceAttr(testItemID, "name", data.Name), - - // network params check - resource.TestCheckResourceAttr(testItemID, "network.%", "4"), - resource.TestCheckResourceAttrSet(testItemID, "network.access_scope"), - resource.TestCheckResourceAttr(testItemID, "network.access_scope", data.AccessScope), - // resource.TestCheckResourceAttrSet(testItemID, "network.acl"), - resource.TestCheckResourceAttr(testItemID, "network.acl.#", strconv.Itoa(len(data.ACLStrings))), - // instance_address and router_address are only checked in enc - - resource.TestCheckResourceAttrSet(testItemID, "project_id"), - resource.TestCheckResourceAttr(testItemID, "project_id", data.ProjectID), - - resource.TestCheckResourceAttrSet(testItemID, "region"), - resource.TestCheckResourceAttr(testItemID, "region", data.Region), - - resource.TestCheckResourceAttrSet(testItemID, "retention_days"), - resource.TestCheckResourceAttr(testItemID, "retention_days", strconv.Itoa(int(data.RetentionDays))), - - resource.TestCheckResourceAttrSet(testItemID, "status"), - resource.TestCheckResourceAttr(testItemID, "status", "READY"), - - // storage params check - resource.TestCheckResourceAttr(testItemID, "storage.%", "2"), - resource.TestCheckResourceAttrSet(testItemID, "storage.class"), - resource.TestCheckResourceAttr(testItemID, "storage.class", data.PerformanceClass), - resource.TestCheckResourceAttrSet(testItemID, "storage.size"), - resource.TestCheckResourceAttr(testItemID, "storage.size", strconv.Itoa(int(data.Size))), - - resource.TestCheckResourceAttrSet(testItemID, "version"), - resource.TestCheckResourceAttr(testItemID, "version", data.Version), - ) -} - -func getInstanceTestID(name string) func(s *terraform.State) (string, error) { - return func(s *terraform.State) (string, error) { - r, ok := s.RootModule().Resources[testutils.ResStr(pfx, "instance", name)] - if !ok { - return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.%s", name) - } - projectID, ok := r.Primary.Attributes["project_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute project_id") - } - region, ok := r.Primary.Attributes["region"] - if !ok { - return "", fmt.Errorf("couldn't find attribute region") - } - instanceID, ok := r.Primary.Attributes["instance_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute instance_id") - } - return fmt.Sprintf("%s,%s,%s", projectID, region, instanceID), nil - } -} - -/* - func getDatabaseTestID(name string) func(s *terraform.State) (string, error) { - return func(s *terraform.State) (string, error) { - r, ok := s.RootModule().Resources[testutils.ResStr(pfx, "database", name)] - if !ok { - return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.%s", name) - } - projectID, ok := r.Primary.Attributes["project_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute project_id") - } - region, ok := r.Primary.Attributes["region"] - if !ok { - return "", fmt.Errorf("couldn't find attribute region") - } - instanceID, ok := r.Primary.Attributes["instance_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute instance_id") - } - databaseID, ok := r.Primary.Attributes["database_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute database_id") - } - return fmt.Sprintf("%s,%s,%s,%s", projectID, region, instanceID, databaseID), nil - } - } - - func getUserTestID(name string) func(s *terraform.State) (string, error) { - return func(s *terraform.State) (string, error) { - r, ok := s.RootModule().Resources[testutils.ResStr(pfx, "user", name)] - if !ok { - return "", fmt.Errorf("couldn't find resource stackitprivatepreview_postgresflexalpha_instance.%s", name) - } - projectID, ok := r.Primary.Attributes["project_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute project_id") - } - region, ok := r.Primary.Attributes["region"] - if !ok { - return "", fmt.Errorf("couldn't find attribute region") - } - instanceID, ok := r.Primary.Attributes["instance_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute instance_id") - } - userID, ok := r.Primary.Attributes["user_id"] - if !ok { - return "", fmt.Errorf("couldn't find attribute user_id") - } - return fmt.Sprintf("%s,%s,%s,%s", projectID, region, instanceID, userID), nil - } - } -*/ -func testAccCheckSQLServerFlexDestroy(s *terraform.State) error { - testutils.Setup() - - pID, ok := os.LookupEnv("TF_ACC_PROJECT_ID") - if !ok { - log.Fatalln("unable to read TF_ACC_PROJECT_ID") - } - - ctx := context.Background() - var client *v3beta1api.APIClient - var err error - - var region, projectID string - region = testutils.Region - if region == "" { - region = "eu01" - } - - projectID = pID - if projectID == "" { - return fmt.Errorf("projectID could not be determined in destroy function") - } - - apiClientConfigOptions := []config.ConfigurationOption{ - config.WithServiceAccountKeyPath(os.Getenv("TF_ACC_SERVICE_ACCOUNT_FILE")), - config.WithRegion(region), - } - if testutils.PostgresFlexCustomEndpoint != "" { - apiClientConfigOptions = append( - apiClientConfigOptions, - config.WithEndpoint(testutils.PostgresFlexCustomEndpoint), - ) - } - client, err = v3beta1api.NewAPIClient(apiClientConfigOptions...) - if err != nil { - log.Fatalln(err) - } - - instancesToDestroy := []string{} - for _, rs := range s.RootModule().Resources { - if rs.Type != "stackitprivatepreview_postgresflexalpha_instance" && - rs.Type != "stackitprivatepreview_postgresflexbeta_instance" { - continue - } - - // instance terraform ID: = "[project_id],[region],[instance_id]" - instanceID := strings.Split(rs.Primary.ID, core.Separator)[2] - instancesToDestroy = append(instancesToDestroy, instanceID) - } - - instancesResp, err := client.DefaultAPI.ListInstancesRequest(ctx, projectID, region). - Size(100). - Execute() - if err != nil { - return fmt.Errorf("getting instancesResp: %w", err) - } - - items := instancesResp.GetInstances() - for i := range items { - if items[i].Id == "" { - continue - } - if utils.Contains(instancesToDestroy, items[i].Id) { - err := client.DefaultAPI.DeleteInstanceRequest(ctx, projectID, region, items[i].Id).Execute() - if err != nil { - return fmt.Errorf("deleting instance %s during CheckDestroy: %w", items[i].Id, err) - } - w := wait.DeleteInstanceWaitHandler( - ctx, - client.DefaultAPI, - testutils.ProjectId, - testutils.Region, - items[i].Id, - ) - _, waitErr := w.SetTimeout(90 * time.Second).WaitWithContext(context.Background()) - if waitErr != nil { - var oapiErr *oapierror.GenericOpenAPIError - isOapiErr := errors.As(waitErr, &oapiErr) - if !isOapiErr { - return fmt.Errorf("could not convert error to oapierror.GenericOpenAPIError") - } - if oapiErr.StatusCode != http.StatusNotFound { - return waitErr - } - } - } - } - return nil -} diff --git a/stackit/internal/services/sqlserverflexbeta/testdata/instance_template.gompl b/stackit/internal/services/sqlserverflexbeta/testdata/instance_template.gompl index 6d795ed2..e71f3fa0 100644 --- a/stackit/internal/services/sqlserverflexbeta/testdata/instance_template.gompl +++ b/stackit/internal/services/sqlserverflexbeta/testdata/instance_template.gompl @@ -4,37 +4,35 @@ provider "stackitprivatepreview" { } resource "stackitprivatepreview_sqlserverflexbeta_instance" "{{ .TfName }}" { - project_id = "{{ .ProjectID }}" + project_id = "{{ .ProjectId }}" name = "{{ .Name }}" backup_schedule = "{{ .BackupSchedule }}" retention_days = {{ .RetentionDays }} - flavor_id = "{{ .FlavorID }}" + flavor_id = "{{ .FlavorId }}" storage = { class = "{{ .PerformanceClass }}" size = {{ .Size }} } {{ if .UseEncryption }} encryption = { - kek_key_id = "{{ .KekKeyID }}" - kek_key_ring_id = "{{ .KekKeyRingID }}" + kek_key_id = "{{ .KekKeyId }}" + kek_key_ring_id = "{{ .KekKeyRingId }}" kek_key_version = {{ .KekKeyVersion }} service_account = "{{ .KekServiceAccount }}" } {{ end }} network = { - acl = [{{ range $i, $v := .ACLStrings }}{{if $i}},{{end}}"{{$v}}"{{end}}] + acl = ["{{ .AclString }}"] access_scope = "{{ .AccessScope }}" } -{{ if .Version }} version = "{{ .Version }}" -{{ end }} } {{ if .Users }} {{ $tfName := .TfName }} {{ range $user := .Users }} resource "stackitprivatepreview_sqlserverflexbeta_user" "{{ $user.Name }}" { - project_id = "{{ $user.ProjectID }}" + project_id = "{{ $user.ProjectId }}" instance_id = stackitprivatepreview_sqlserverflexbeta_instance.{{ $tfName }}.instance_id username = "{{ $user.Name }}" roles = [{{ range $i, $v := $user.Roles }}{{if $i}},{{end}}"{{$v}}"{{end}}] @@ -47,7 +45,7 @@ resource "stackitprivatepreview_sqlserverflexbeta_user" "{{ $user.Name }}" { {{ range $db := .Databases }} resource "stackitprivatepreview_sqlserverflexbeta_database" "{{ $db.Name }}" { depends_on = [stackitprivatepreview_sqlserverflexbeta_user.{{ $db.Owner }}] - project_id = "{{ $db.ProjectID }}" + project_id = "{{ $db.ProjectId }}" instance_id = stackitprivatepreview_sqlserverflexbeta_instance.{{ $tfName }}.instance_id name = "{{ $db.Name }}" owner = "{{ $db.Owner }}" diff --git a/stackit/internal/services/sqlserverflexbeta/user/datasources_gen/user_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/user/datasources_gen/user_data_source_gen.go index ea4833ee..34aef9ca 100644 --- a/stackit/internal/services/sqlserverflexbeta/user/datasources_gen/user_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/user/datasources_gen/user_data_source_gen.go @@ -68,7 +68,6 @@ func UserDataSourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/user/resource.go b/stackit/internal/services/sqlserverflexbeta/user/resource.go index 363ce203..0c04f31b 100644 --- a/stackit/internal/services/sqlserverflexbeta/user/resource.go +++ b/stackit/internal/services/sqlserverflexbeta/user/resource.go @@ -308,7 +308,7 @@ func (r *userResource) Create( region, userId, ).SetSleepBeforeWait( - 10 * time.Second, + 90 * time.Second, ).SetTimeout( 90 * time.Minute, ).WaitWithContext(ctx) @@ -459,23 +459,23 @@ func (r *userResource) Delete( ctx = core.InitProviderContext(ctx) - projectID := model.ProjectId.ValueString() - instanceID := model.InstanceId.ValueString() - userID := model.UserId.ValueInt64() + projectId := model.ProjectId.ValueString() + instanceId := model.InstanceId.ValueString() + userId := model.UserId.ValueInt64() region := model.Region.ValueString() - ctx = tflog.SetField(ctx, "project_id", projectID) - ctx = tflog.SetField(ctx, "instance_id", instanceID) - ctx = tflog.SetField(ctx, "user_id", userID) + ctx = tflog.SetField(ctx, "project_id", projectId) + ctx = tflog.SetField(ctx, "instance_id", instanceId) + ctx = tflog.SetField(ctx, "user_id", userId) ctx = tflog.SetField(ctx, "region", region) // Delete existing record set // err := r.client.DeleteUserRequest(ctx, projectId, region, instanceId, userId).Execute() - err := r.client.DefaultAPI.DeleteUserRequest(ctx, projectID, region, instanceID, userID).Execute() + err := r.client.DefaultAPI.DeleteUserRequest(ctx, projectId, region, instanceId, userId).Execute() if err != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(err, &oapiErr) if !ok { - core.LogAndAddError(ctx, &resp.Diagnostics, "User Delete Error", fmt.Sprintf("error is no oapi error: %v", err)) + // TODO err handling return } @@ -487,14 +487,12 @@ func (r *userResource) Delete( // tflog.Warn(ctx, "[delete user] Wait handler got error 500") // return false, nil, nil default: - core.LogAndAddError(ctx, &resp.Diagnostics, "User Delete Error", fmt.Sprintf("Unexpected API error: %v", err)) + // TODO err handling return } } // Delete existing record set - _, err = sqlserverflexbetaWait.DeleteUserWaitHandler(ctx, r.client.DefaultAPI, projectID, region, instanceID, userID). - SetTimeout(90 * time.Minute). - SetSleepBeforeWait(10 * time.Second). + _, err = sqlserverflexbetaWait.DeleteUserWaitHandler(ctx, r.client.DefaultAPI, projectId, region, instanceId, userId). WaitWithContext(ctx) if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, "User Delete Error", fmt.Sprintf("Calling API: %v", err)) diff --git a/stackit/internal/services/sqlserverflexbeta/user/resources_gen/user_resource_gen.go b/stackit/internal/services/sqlserverflexbeta/user/resources_gen/user_resource_gen.go index aedfb365..f181f79c 100644 --- a/stackit/internal/services/sqlserverflexbeta/user/resources_gen/user_resource_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/user/resources_gen/user_resource_gen.go @@ -60,7 +60,6 @@ func UserResourceSchema(ctx context.Context) schema.Schema { Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, diff --git a/stackit/internal/services/sqlserverflexbeta/versions/datasources_gen/versions_data_source_gen.go b/stackit/internal/services/sqlserverflexbeta/versions/datasources_gen/version_data_source_gen.go similarity index 99% rename from stackit/internal/services/sqlserverflexbeta/versions/datasources_gen/versions_data_source_gen.go rename to stackit/internal/services/sqlserverflexbeta/versions/datasources_gen/version_data_source_gen.go index c4f33642..239b44d3 100644 --- a/stackit/internal/services/sqlserverflexbeta/versions/datasources_gen/versions_data_source_gen.go +++ b/stackit/internal/services/sqlserverflexbeta/versions/datasources_gen/version_data_source_gen.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource/schema" ) -func VersionsDataSourceSchema(ctx context.Context) schema.Schema { +func VersionDataSourceSchema(ctx context.Context) schema.Schema { return schema.Schema{ Attributes: map[string]schema.Attribute{ "project_id": schema.StringAttribute{ @@ -26,13 +26,12 @@ func VersionsDataSourceSchema(ctx context.Context) schema.Schema { MarkdownDescription: "The STACKIT project ID.", }, "region": schema.StringAttribute{ - Optional: true, + Required: true, Description: "The region which should be addressed", MarkdownDescription: "The region which should be addressed", Validators: []validator.String{ stringvalidator.OneOf( "eu01", - "eu02", ), }, }, @@ -74,7 +73,7 @@ func VersionsDataSourceSchema(ctx context.Context) schema.Schema { } } -type VersionsModel struct { +type VersionModel struct { ProjectId types.String `tfsdk:"project_id"` Region types.String `tfsdk:"region"` Versions types.List `tfsdk:"versions"` diff --git a/stackit/internal/wait/postgresflexalpha/wait.go b/stackit/internal/wait/postgresflexalpha/wait.go index 6b1f250a..26f2d729 100644 --- a/stackit/internal/wait/postgresflexalpha/wait.go +++ b/stackit/internal/wait/postgresflexalpha/wait.go @@ -2,11 +2,9 @@ package postgresflexalpha import ( "context" - "crypto/rand" "errors" "fmt" "math" - "math/big" "net/http" "time" @@ -31,47 +29,45 @@ const ( // APIClientInstanceInterface Interface needed for tests type APIClientInstanceInterface interface { - GetInstanceRequest(ctx context.Context, projectID, region, instanceID string) v3alpha1api.ApiGetInstanceRequestRequest + GetInstanceRequest(ctx context.Context, projectId, region, instanceId string) v3alpha1api.ApiGetInstanceRequestRequest ListUsersRequest( ctx context.Context, - projectID string, + projectId string, region string, - instanceID string, + instanceId string, ) v3alpha1api.ApiListUsersRequestRequest } // APIClientUserInterface Interface needed for tests type APIClientUserInterface interface { - GetUserRequest(ctx context.Context, projectID, region, instanceID string, userID int32) v3alpha1api.ApiGetUserRequestRequest + GetUserRequest(ctx context.Context, projectId, region, instanceId string, userId int32) v3alpha1api.ApiGetUserRequestRequest } // APIClientDatabaseInterface Interface needed for tests type APIClientDatabaseInterface interface { - GetDatabaseRequest(ctx context.Context, projectID string, region string, instanceID string, databaseID int32) v3alpha1api.ApiGetDatabaseRequestRequest + GetDatabaseRequest(ctx context.Context, projectId string, region string, instanceId string, databaseId int32) v3alpha1api.ApiGetDatabaseRequestRequest } // CreateInstanceWaitHandler will wait for instance creation func CreateInstanceWaitHandler( - ctx context.Context, a APIClientInstanceInterface, projectID, region, - instanceID string, + ctx context.Context, a APIClientInstanceInterface, projectId, region, + instanceId string, ) *wait.AsyncActionHandler[v3alpha1api.GetInstanceResponse] { instanceCreated := false var instanceGetResponse *v3alpha1api.GetInstanceResponse - maxWait := time.Minute * 90 + maxWait := time.Minute * 45 startTime := time.Now() extendedTimeout := 0 - maxFailedCount := 10 - failedCount := 0 handler := wait.New( func() (waitFinished bool, response *v3alpha1api.GetInstanceResponse, err error) { if !instanceCreated { - s, getErr := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() - if getErr != nil { - return false, nil, getErr + s, err := a.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() + if err != nil { + return false, nil, err } - if s == nil || s.Id != instanceID { + if s == nil || s.Id != instanceId { return false, nil, nil } tflog.Debug( @@ -81,7 +77,7 @@ func CreateInstanceWaitHandler( ) switch s.Status { default: - return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceID, s.Status) + return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceId, s.Status) case InstanceStateEmpty: return false, nil, nil case InstanceStatePending: @@ -98,15 +94,30 @@ func CreateInstanceWaitHandler( "Wait handler still got status %s after %v for instance: %s", InstanceStateProgressing, maxWait, - instanceID, + instanceId, ), ) if extendedTimeout < 3 { maxWait += time.Minute * 5 extendedTimeout++ - return false, nil, nil + if *s.Network.AccessScope == "SNA" { + ready := true + if s.Network.InstanceAddress == nil { + tflog.Warn(ctx, "Waiting for instance_address") + ready = false + } + if s.Network.RouterAddress == nil { + tflog.Warn(ctx, "Waiting for router_address") + ready = false + } + if !ready { + return false, nil, nil + } + } } - return false, nil, fmt.Errorf("instance after max timeout still in state %s", InstanceStateProgressing) + + instanceCreated = true + instanceGetResponse = s case InstanceStateSuccess: if s.Network.AccessScope != nil && *s.Network.AccessScope == "SNA" { if s.Network.InstanceAddress == nil { @@ -121,27 +132,8 @@ func CreateInstanceWaitHandler( instanceCreated = true instanceGetResponse = s case InstanceStateFailed: - if failedCount < maxFailedCount { - failedCount++ - tflog.Warn( - ctx, "got failed status from API retry", map[string]interface{}{ - "failedCount": failedCount, - }, - ) - var waitCounter int64 = 1 - maxWaitInt := big.NewInt(10) - n, randErr := rand.Int(rand.Reader, maxWaitInt) - if randErr == nil { - waitCounter = n.Int64() + 1 - } - time.Sleep(time.Duration(waitCounter*30) * time.Second) //nolint:gosec // not that important and temporary - return false, nil, nil - } - return true, s, fmt.Errorf( - "update got status FAILURE for instance with id %s after %d retries", - instanceID, - failedCount, - ) + tflog.Warn(ctx, fmt.Sprintf("Wait handler got status FAILURE for instance: %s", instanceId)) + return false, nil, nil // API responds with FAILURE for some seconds and then the instance goes to READY // return true, s, fmt.Errorf("create failed for instance with id %s", instanceId) } @@ -150,7 +142,7 @@ func CreateInstanceWaitHandler( tflog.Info(ctx, "Waiting for instance (calling list users") // // User operations aren't available right after an instance is deemed successful // // To check if they are, perform a users request - _, err = a.ListUsersRequest(ctx, projectID, region, instanceID).Execute() + _, err = a.ListUsersRequest(ctx, projectId, region, instanceId).Execute() if err == nil { return true, instanceGetResponse, nil } @@ -158,7 +150,7 @@ func CreateInstanceWaitHandler( if !ok { return false, nil, err } - // TODO: refactor and cooperate with api guys to mitigate // nolint: // reason upfront + // TODO: refactor and cooperate with api guys to mitigate if oapiErr.StatusCode < 500 { return true, instanceGetResponse, fmt.Errorf( "users request after instance creation returned %d status code", @@ -168,6 +160,8 @@ func CreateInstanceWaitHandler( return false, nil, nil }, ) + // Sleep before wait is set because sometimes API returns 404 right after creation request + handler.SetTimeout(90 * time.Minute).SetSleepBeforeWait(30 * time.Second) return handler } @@ -176,8 +170,6 @@ func PartialUpdateInstanceWaitHandler( ctx context.Context, a APIClientInstanceInterface, projectID, region, instanceID string, ) *wait.AsyncActionHandler[v3alpha1api.GetInstanceResponse] { - maxFailedCount := 3 - failedCount := 0 handler := wait.New( func() (waitFinished bool, response *v3alpha1api.GetInstanceResponse, err error) { s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() @@ -203,30 +195,11 @@ func PartialUpdateInstanceWaitHandler( case InstanceStateUnknown: return false, nil, nil case InstanceStateFailed: - if failedCount < maxFailedCount { - failedCount++ - tflog.Warn( - ctx, "got failed status from API retry", map[string]interface{}{ - "failedCount": failedCount, - }, - ) - var waitCounter int64 = 1 - maxWait := big.NewInt(7) - n, err := rand.Int(rand.Reader, maxWait) - if err == nil { - waitCounter = n.Int64() + 1 - } - time.Sleep(time.Duration(waitCounter*30) * time.Second) //nolint:gosec // not that important and temporary - return false, nil, nil - } - return true, s, fmt.Errorf( - "update got status FAILURE for instance with id %s after %d retries", - instanceID, - failedCount, - ) + return true, s, fmt.Errorf("update got status FAILURE for instance with id %s", instanceID) } }, ) + handler.SetTimeout(45 * time.Minute).SetSleepBeforeWait(30 * time.Second) return handler } @@ -281,8 +254,8 @@ func GetDatabaseByIdWaitHandler( if databaseID > math.MaxInt32 { return false, nil, fmt.Errorf("databaseID too large for int32") } - dbID32 := int32(databaseID) //nolint:gosec // is checked above - s, err := a.GetDatabaseRequest(ctx, projectID, region, instanceID, dbID32).Execute() + dbId32 := int32(databaseID) //nolint:gosec // is checked above + s, err := a.GetDatabaseRequest(ctx, projectID, region, instanceID, dbId32).Execute() if err != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(err, &oapiErr) @@ -290,7 +263,6 @@ func GetDatabaseByIdWaitHandler( return false, nil, fmt.Errorf("could not convert error to oapierror.GenericOpenAPIError") } switch oapiErr.StatusCode { - // TODO: work-around case http.StatusBadGateway, http.StatusGatewayTimeout, http.StatusServiceUnavailable: tflog.Warn( ctx, "api responded with 50[2,3,4] status", map[string]interface{}{ @@ -323,8 +295,6 @@ func DeleteInstanceWaitHandler( instanceID string, timeout, sleepBeforeWait time.Duration, ) error { - maxFailedCount := 3 - failedCount := 0 handler := wait.New( func() (waitFinished bool, response *v3alpha1api.GetInstanceResponse, err error) { s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() @@ -344,22 +314,6 @@ func DeleteInstanceWaitHandler( case InstanceStateEmpty, InstanceStatePending, InstanceStateUnknown, InstanceStateProgressing, InstanceStateSuccess: return false, nil, nil case InstanceStateFailed: - if failedCount < maxFailedCount { - failedCount++ - tflog.Warn( - ctx, "got failed status from API retry", map[string]interface{}{ - "failedCount": failedCount, - }, - ) - var waitCounter int64 = 1 - maxWait := big.NewInt(7) - n, err := rand.Int(rand.Reader, maxWait) - if err == nil { - waitCounter = n.Int64() + 1 - } - time.Sleep(time.Duration(waitCounter*30) * time.Second) //nolint:gosec // not that important and temporary - return false, nil, nil - } return true, nil, fmt.Errorf("wait handler got status FAILURE for instance: %s", instanceID) default: return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceID, s.Status) diff --git a/stackit/internal/wait/postgresflexalpha/wait_test.go b/stackit/internal/wait/postgresflexalpha/wait_test.go index c0a143d6..faef6cbf 100644 --- a/stackit/internal/wait/postgresflexalpha/wait_test.go +++ b/stackit/internal/wait/postgresflexalpha/wait_test.go @@ -4,7 +4,6 @@ package postgresflexalpha import ( "context" - "os" "testing" "time" @@ -23,8 +22,6 @@ func TestCreateInstanceWaitHandler(t *testing.T) { usersGetErrorStatus int wantErr bool wantRes *v3alpha1api.GetInstanceResponse - timeout time.Duration - onlyOnLong bool }{ { desc: "create_succeeded", @@ -49,7 +46,6 @@ func TestCreateInstanceWaitHandler(t *testing.T) { }, }, { - onlyOnLong: true, desc: "create_failed", instanceGetFails: false, instanceState: InstanceStateFailed, @@ -60,18 +56,7 @@ func TestCreateInstanceWaitHandler(t *testing.T) { RouterAddress: utils.Ptr("10.0.0.1"), }, wantErr: true, - wantRes: &v3alpha1api.GetInstanceResponse{ - Id: "foo-bar", - Status: InstanceStateFailed, - Network: v3alpha1api.InstanceNetwork{ - AccessScope: nil, - Acl: nil, - InstanceAddress: utils.Ptr("10.0.0.1"), - RouterAddress: utils.Ptr("10.0.0.1"), - }, - }, - // waiter uses random timeouts up to 8 times 30 secs - timeout: 300 * time.Second, + wantRes: nil, }, { desc: "create_failed_2", @@ -157,13 +142,6 @@ func TestCreateInstanceWaitHandler(t *testing.T) { }, } for _, tt := range tests { - if tt.onlyOnLong { - _, ok := os.LookupEnv("TF_RUN_LONG_TESTS") - if !ok { - t.Logf("skipping test '%s' because TF_RUN_LONG_TESTS env var is missing", tt.desc) - continue - } - } t.Run( tt.desc, func(t *testing.T) { instanceID := "foo-bar" @@ -203,13 +181,9 @@ func TestCreateInstanceWaitHandler(t *testing.T) { ListUsersRequestExecuteMock: &listUsersMock, } - handler := CreateInstanceWaitHandler(context.Background(), apiClientMock, "", "", instanceID). - SetTimeout(10 * time.Millisecond) - if tt.timeout != 0 { - handler.SetTimeout(tt.timeout) - } + handler := CreateInstanceWaitHandler(context.Background(), apiClientMock, "", "", instanceID) - gotRes, err := handler.SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) if (err != nil) != tt.wantErr { t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) } @@ -230,8 +204,6 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { instanceNetwork v3alpha1api.InstanceNetwork wantErr bool wantRes *v3alpha1api.GetInstanceResponse - timeout time.Duration - onlyOnLong bool }{ { desc: "update_succeeded", @@ -256,7 +228,6 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { }, }, { - onlyOnLong: true, desc: "update_failed", instanceGetFails: false, instanceState: InstanceStateFailed, @@ -277,7 +248,6 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { RouterAddress: utils.Ptr("10.0.0.1"), }, }, - timeout: 300 * time.Second, }, { desc: "update_failed_2", @@ -313,14 +283,6 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { }, } for _, tt := range tests { - if tt.onlyOnLong { - _, ok := os.LookupEnv("TF_RUN_LONG_TESTS") - if !ok { - t.Logf("skipping test '%s' because TF_RUN_LONG_TESTS env var is missing", tt.desc) - continue - } - } - t.Run( tt.desc, func(t *testing.T) { instanceID := "foo-bar" @@ -354,13 +316,9 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { ListUsersRequestExecuteMock: &listUsersMock, } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClientMock, "", "", instanceID). - SetTimeout(10 * time.Millisecond) - if tt.timeout > 0 { - handler.SetTimeout(tt.timeout) - } + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClientMock, "", "", instanceID) - gotRes, err := handler.WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) if (err != nil) != tt.wantErr { t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) } diff --git a/stackit/internal/wait/sqlserverflexbeta/wait.go b/stackit/internal/wait/sqlserverflexbeta/wait.go index e0830fac..a13def0f 100644 --- a/stackit/internal/wait/sqlserverflexbeta/wait.go +++ b/stackit/internal/wait/sqlserverflexbeta/wait.go @@ -30,35 +30,35 @@ const ( type APIClientInterface interface { GetInstanceRequest( ctx context.Context, - projectID, region, instanceID string, + projectId, region, instanceId string, ) sqlserverflex.ApiGetInstanceRequestRequest GetDatabaseRequest( ctx context.Context, - projectID string, + projectId string, region string, - instanceID string, + instanceId string, databaseName string, ) sqlserverflex.ApiGetDatabaseRequestRequest GetUserRequest( ctx context.Context, - projectID string, + projectId string, region string, - instanceID string, - userID int64, + instanceId string, + userId int64, ) sqlserverflex.ApiGetUserRequestRequest ListRolesRequest( ctx context.Context, - projectID string, + projectId string, region string, - instanceID string, + instanceId string, ) sqlserverflex.ApiListRolesRequestRequest ListUsersRequest( ctx context.Context, - projectID string, + projectId string, region string, - instanceID string, + instanceId string, ) sqlserverflex.ApiListUsersRequestRequest } @@ -66,10 +66,10 @@ type APIClientInterface interface { type APIClientUserInterface interface { DeleteUserRequestExecute( ctx context.Context, - projectID string, + projectId string, region string, - instanceID string, - userID int64, + instanceId string, + userId int64, ) error } @@ -77,11 +77,11 @@ type APIClientUserInterface interface { func CreateInstanceWaitHandler( ctx context.Context, a APIClientInterface, - projectID, instanceID, region string, + projectId, instanceId, region string, ) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] { handler := wait.New( func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) { - s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + s, err := a.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(err, &oapiErr) @@ -89,20 +89,13 @@ func CreateInstanceWaitHandler( return false, nil, fmt.Errorf("could not convert error to oapierror.GenericOpenAPIError: %w", err) } switch oapiErr.StatusCode { - case http.StatusOK: - return false, nil, nil case http.StatusNotFound: return false, nil, nil default: - // TODO: work-around - if strings.Contains(err.Error(), "is not a valid InstanceEdition") { - tflog.Info(ctx, "API WORKAROUND", map[string]interface{}{"err": err}) - return false, nil, nil - } return false, nil, fmt.Errorf("api error: %w", err) } } - if s == nil || s.Id != instanceID { + if s == nil || s.Id != instanceId { return false, nil, nil } switch strings.ToLower(string(s.Status)) { @@ -120,7 +113,7 @@ func CreateInstanceWaitHandler( tflog.Info(ctx, "trying to get roles") time.Sleep(10 * time.Second) - _, rolesErr := a.ListRolesRequest(ctx, projectID, region, instanceID).Execute() + _, rolesErr := a.ListRolesRequest(ctx, projectId, region, instanceId).Execute() if rolesErr != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(rolesErr, &oapiErr) @@ -144,7 +137,7 @@ func CreateInstanceWaitHandler( tflog.Info(ctx, "trying to get users") time.Sleep(10 * time.Second) - _, usersErr := a.ListUsersRequest(ctx, projectID, region, instanceID).Execute() + _, usersErr := a.ListUsersRequest(ctx, projectId, region, instanceId).Execute() if usersErr != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(usersErr, &oapiErr) @@ -169,13 +162,13 @@ func CreateInstanceWaitHandler( case strings.ToLower(InstanceStateUnknown): return true, nil, fmt.Errorf( "create failed for instance %s with status %s", - instanceID, + instanceId, InstanceStateUnknown, ) case strings.ToLower(InstanceStateFailed): return true, nil, fmt.Errorf( "create failed for instance %s with status %s", - instanceID, + instanceId, InstanceStateFailed, ) case strings.ToLower(InstanceStatePending), strings.ToLower(InstanceStateProcessing): @@ -189,7 +182,7 @@ func CreateInstanceWaitHandler( default: tflog.Info( ctx, "Wait (create) received unknown status", map[string]interface{}{ - "instanceId": instanceID, + "instanceId": instanceId, "status": s.Status, }, ) @@ -204,22 +197,22 @@ func CreateInstanceWaitHandler( func UpdateInstanceWaitHandler( ctx context.Context, a APIClientInterface, - projectID, instanceID, region string, + projectId, instanceId, region string, ) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] { handler := wait.New( func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) { - s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + s, err := a.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err != nil { return false, nil, err } - if s == nil || s.Id != instanceID { + if s == nil || s.Id != instanceId { return false, nil, nil } switch strings.ToLower(string(s.Status)) { case strings.ToLower(InstanceStateSuccess): return true, s, nil case strings.ToLower(InstanceStateUnknown), strings.ToLower(InstanceStateFailed): - return true, s, fmt.Errorf("update failed for instance with id %s", instanceID) + return true, s, fmt.Errorf("update failed for instance with id %s", instanceId) case strings.ToLower(InstanceStatePending), strings.ToLower(InstanceStateProcessing): tflog.Info( ctx, "request is being handled", map[string]interface{}{ @@ -230,7 +223,7 @@ func UpdateInstanceWaitHandler( default: tflog.Info( ctx, "Wait (update) received unknown status", map[string]interface{}{ - "instanceId": instanceID, + "instanceId": instanceId, "status": s.Status, }, ) @@ -245,11 +238,11 @@ func UpdateInstanceWaitHandler( func DeleteInstanceWaitHandler( ctx context.Context, a APIClientInterface, - projectID, instanceID, region string, + projectId, instanceId, region string, ) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] { handler := wait.New( func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) { - s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute() + s, err := a.GetInstanceRequest(ctx, projectId, region, instanceId).Execute() if err == nil { return false, s, nil } @@ -264,6 +257,7 @@ func DeleteInstanceWaitHandler( return true, nil, nil }, ) + handler.SetTimeout(30 * time.Minute) return handler } @@ -271,11 +265,11 @@ func DeleteInstanceWaitHandler( func CreateDatabaseWaitHandler( ctx context.Context, a APIClientInterface, - projectID, instanceID, region, databaseName string, + projectId, instanceId, region, databaseName string, ) *wait.AsyncActionHandler[sqlserverflex.GetDatabaseResponse] { handler := wait.New( func() (waitFinished bool, response *sqlserverflex.GetDatabaseResponse, err error) { - s, err := a.GetDatabaseRequest(ctx, projectID, region, instanceID, databaseName).Execute() + s, err := a.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute() if err != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(err, &oapiErr) @@ -303,12 +297,12 @@ func CreateDatabaseWaitHandler( func CreateUserWaitHandler( ctx context.Context, a APIClientInterface, - projectID, instanceID, region string, - userID int64, + projectId, instanceId, region string, + userId int64, ) *wait.AsyncActionHandler[sqlserverflex.GetUserResponse] { handler := wait.New( func() (waitFinished bool, response *sqlserverflex.GetUserResponse, err error) { - s, err := a.GetUserRequest(ctx, projectID, region, instanceID, userID).Execute() + s, err := a.GetUserRequest(ctx, projectId, region, instanceId, userId).Execute() if err != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(err, &oapiErr) @@ -330,7 +324,7 @@ func CreateUserWaitHandler( func WaitForUserWaitHandler( ctx context.Context, a APIClientInterface, - projectID, instanceID, region, userName string, + projectId, instanceId, region, userName string, ) *wait.AsyncActionHandler[sqlserverflex.ListUserResponse] { startTime := time.Now() timeOut := 2 * time.Minute @@ -340,7 +334,7 @@ func WaitForUserWaitHandler( if time.Since(startTime) > timeOut { return false, nil, errors.New("ran into timeout") } - s, err := a.ListUsersRequest(ctx, projectID, region, instanceID).Size(100).Execute() + s, err := a.ListUsersRequest(ctx, projectId, region, instanceId).Size(100).Execute() if err != nil { var oapiErr *oapierror.GenericOpenAPIError ok := errors.As(err, &oapiErr) @@ -382,12 +376,12 @@ func WaitForUserWaitHandler( func DeleteUserWaitHandler( ctx context.Context, a APIClientInterface, - projectID, region, instanceID string, - userID int64, + projectId, region, instanceId string, + userId int64, ) *wait.AsyncActionHandler[struct{}] { handler := wait.New( func() (waitFinished bool, response *struct{}, err error) { - _, err = a.GetUserRequest(ctx, projectID, region, instanceID, userID).Execute() + _, err = a.GetUserRequest(ctx, projectId, region, instanceId, userId).Execute() if err == nil { return false, nil, nil } @@ -405,5 +399,7 @@ func DeleteUserWaitHandler( } }, ) + handler.SetTimeout(15 * time.Minute) + handler.SetSleepBeforeWait(15 * time.Second) return handler } diff --git a/stackit/provider.go b/stackit/provider.go index 0cda837a..62990050 100644 --- a/stackit/provider.go +++ b/stackit/provider.go @@ -19,11 +19,11 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" sdkauth "github.com/stackitcloud/stackit-sdk-go/core/auth" "github.com/stackitcloud/stackit-sdk-go/core/config" - sqlserverFlexBetaFlavor "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/flavor" - //sqlserverflexalphaDatabase "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/database" - //sqlserverflexalphaInstance "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/instance" - //sqlserverflexalphaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/user" + sqlserverflexalphaDatabase "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/database" + sqlserverflexalphaInstance "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/instance" + sqlserverflexalphaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/user" + sqlserverflexbetaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/user" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core" "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/features" @@ -36,7 +36,7 @@ import ( sqlserverFlexBetaDatabase "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/database" sqlserverflexBetaInstance "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/instance" - sqlserverflexbetaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/user" + // sqlserverFlexBetaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbetaUser/user" ) // Ensure the implementation satisfies the expected interfaces @@ -536,14 +536,14 @@ func (p *Provider) DataSources(_ context.Context) []func() datasource.DataSource postgresflexalphaFlavors.NewFlavorsDataSource, // sqlserverFlexAlphaFlavor.NewFlavorDataSource, - //sqlserverflexalphaInstance.NewInstanceDataSource, - //sqlserverflexalphaUser.NewUserDataSource, - //sqlserverflexalphaDatabase.NewDatabaseDataSource, + sqlserverflexalphaInstance.NewInstanceDataSource, + sqlserverflexalphaUser.NewUserDataSource, + sqlserverflexalphaDatabase.NewDatabaseDataSource, sqlserverFlexBetaDatabase.NewDatabaseDataSource, sqlserverflexBetaInstance.NewInstanceDataSource, sqlserverflexbetaUser.NewUserDataSource, - sqlserverFlexBetaFlavor.NewFlavorDataSource, + // sqlserverFlexBetaFlavor.NewFlavorDataSource, } } @@ -554,9 +554,9 @@ func (p *Provider) Resources(_ context.Context) []func() resource.Resource { postgresFlexAlphaUser.NewUserResource, postgresFlexAlphaDatabase.NewDatabaseResource, - //sqlserverflexalphaInstance.NewInstanceResource, - //sqlserverflexalphaUser.NewUserResource, - //sqlserverflexalphaDatabase.NewDatabaseResource, + sqlserverflexalphaInstance.NewInstanceResource, + sqlserverflexalphaUser.NewUserResource, + sqlserverflexalphaDatabase.NewDatabaseResource, sqlserverflexBetaInstance.NewInstanceResource, sqlserverflexbetaUser.NewUserResource, diff --git a/stackit/provider_acc_test.go b/stackit/provider_acc_test.go index a50503ae..38e22144 100644 --- a/stackit/provider_acc_test.go +++ b/stackit/provider_acc_test.go @@ -10,6 +10,8 @@ import ( "github.com/google/go-cmp/cmp" + sqlserverflexalphaDatabase "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/database" + //nolint:staticcheck // used for acceptance testing postgresFlexAlphaFlavor "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/flavor" @@ -21,6 +23,8 @@ import ( postgresflexalphaFlavors "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/flavors" postgresFlexAlphaInstance "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance" postgresFlexAlphaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/user" + sqlserverFlexAlphaInstance "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/instance" + sqlserverFlexAlphaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/user" sqlserverflexBetaDatabase "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/database" sqlserverFlexBetaInstance "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/instance" sqlserverFlexBetaUser "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta/user" @@ -59,9 +63,9 @@ func TestUnitProviderHasChildDataSources_Basic(t *testing.T) { postgresflexalphaFlavors.NewFlavorsDataSource(), // sqlserverFlexAlphaFlavor.NewFlavorDataSource(), - //sqlserverFlexAlphaInstance.NewInstanceDataSource(), - //sqlserverFlexAlphaUser.NewUserDataSource(), - //sqlserverflexalphaDatabase.NewDatabaseDataSource(), + sqlserverFlexAlphaInstance.NewInstanceDataSource(), + sqlserverFlexAlphaUser.NewUserDataSource(), + sqlserverflexalphaDatabase.NewDatabaseDataSource(), sqlserverflexBetaDatabase.NewDatabaseDataSource(), sqlserverFlexBetaInstance.NewInstanceDataSource(), @@ -95,9 +99,9 @@ func TestUnitProviderHasChildResources_Basic(t *testing.T) { postgresFlexAlphaUser.NewUserResource(), postgresFlexAlphaDatabase.NewDatabaseResource(), - //sqlserverFlexAlphaInstance.NewInstanceResource(), - //sqlserverFlexAlphaUser.NewUserResource(), - //sqlserverflexalphaDatabase.NewDatabaseResource(), + sqlserverFlexAlphaInstance.NewInstanceResource(), + sqlserverFlexAlphaUser.NewUserResource(), + sqlserverflexalphaDatabase.NewDatabaseResource(), sqlserverFlexBetaInstance.NewInstanceResource(), sqlserverFlexBetaUser.NewUserResource(), diff --git a/tools/go.sum b/tools/go.sum index ce4c45eb..d14741ce 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1,4 +1,6 @@ +4d63.com/gocheckcompilerdirectives v1.3.0 h1:Ew5y5CtcAAQeTVKUVFrE7EwHMrTO6BggtEj8BZSjZ3A= 4d63.com/gocheckcompilerdirectives v1.3.0/go.mod h1:ofsJ4zx2QAuIP/NO/NAh1ig6R1Fb18/GI7RVMwz7kAY= +4d63.com/gochecknoglobals v0.2.2 h1:H1vdnwnMaZdQW/N+NrkT1SZMTBmcwHe9Vq8lJcYYTtU= 4d63.com/gochecknoglobals v0.2.2/go.mod h1:lLxwTQjL5eIesRbvnzIP3jZtG140FnTdz+AlMa+ogt0= 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= @@ -32,105 +34,198 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +codeberg.org/chavacava/garif v0.2.0 h1:F0tVjhYbuOCnvNcU3YSpO6b3Waw6Bimy4K0mM8y6MfY= codeberg.org/chavacava/garif v0.2.0/go.mod h1:P2BPbVbT4QcvLZrORc2T29szK3xEOlnl0GiPTJmEqBQ= +codeberg.org/polyfloyd/go-errorlint v1.9.0 h1:VkdEEmA1VBpH6ecQoMR4LdphVI3fA4RrCh2an7YmodI= codeberg.org/polyfloyd/go-errorlint v1.9.0/go.mod h1:GPRRu2LzVijNn4YkrZYJfatQIdS+TrcK8rL5Xs24qw8= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dev.gaijin.team/go/exhaustruct/v4 v4.0.0 h1:873r7aNneqoBB3IaFIzhvt2RFYTuHgmMjoKfwODoI1Y= dev.gaijin.team/go/exhaustruct/v4 v4.0.0/go.mod h1:aZ/k2o4Y05aMJtiux15x8iXaumE88YdiB0Ai4fXOzPI= +dev.gaijin.team/go/golib v0.6.0 h1:v6nnznFTs4bppib/NyU1PQxobwDHwCXXl15P7DV5Zgo= dev.gaijin.team/go/golib v0.6.0/go.mod h1:uY1mShx8Z/aNHWDyAkZTkX+uCi5PdX7KsG1eDQa2AVE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/4meepo/tagalign v1.4.3 h1:Bnu7jGWwbfpAie2vyl63Zup5KuRv21olsPIha53BJr8= github.com/4meepo/tagalign v1.4.3/go.mod h1:00WwRjiuSbrRJnSVeGWPLp2epS5Q/l4UEy0apLLS37c= +github.com/Abirdcfly/dupword v0.1.7 h1:2j8sInznrje4I0CMisSL6ipEBkeJUJAmK1/lfoNGWrQ= github.com/Abirdcfly/dupword v0.1.7/go.mod h1:K0DkBeOebJ4VyOICFdppB23Q0YMOgVafM0zYW0n9lF4= +github.com/AdminBenni/iota-mixing v1.0.0 h1:Os6lpjG2dp/AE5fYBPAA1zfa2qMdCAWwPMCgpwKq7wo= github.com/AdminBenni/iota-mixing v1.0.0/go.mod h1:i4+tpAaB+qMVIV9OK3m4/DAynOd5bQFaOu+2AhtBCNY= +github.com/AlwxSin/noinlineerr v1.0.5 h1:RUjt63wk1AYWTXtVXbSqemlbVTb23JOSRiNsshj7TbY= github.com/AlwxSin/noinlineerr v1.0.5/go.mod h1:+QgkkoYrMH7RHvcdxdlI7vYYEdgeoFOVjU9sUhw/rQc= +github.com/Antonboom/errname v1.1.1 h1:bllB7mlIbTVzO9jmSWVWLjxTEbGBVQ1Ff/ClQgtPw9Q= github.com/Antonboom/errname v1.1.1/go.mod h1:gjhe24xoxXp0ScLtHzjiXp0Exi1RFLKJb0bVBtWKCWQ= +github.com/Antonboom/nilnil v1.1.1 h1:9Mdr6BYd8WHCDngQnNVV0b554xyisFioEKi30sksufQ= github.com/Antonboom/nilnil v1.1.1/go.mod h1:yCyAmSw3doopbOWhJlVci+HuyNRuHJKIv6V2oYQa8II= +github.com/Antonboom/testifylint v1.6.4 h1:gs9fUEy+egzxkEbq9P4cpcMB6/G0DYdMeiFS87UiqmQ= github.com/Antonboom/testifylint v1.6.4/go.mod h1:YO33FROXX2OoUfwjz8g+gUxQXio5i9qpVy7nXGbxDD4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Djarvur/go-err113 v0.1.1 h1:eHfopDqXRwAi+YmCUas75ZE0+hoBHJ2GQNLYRSxao4g= github.com/Djarvur/go-err113 v0.1.1/go.mod h1:IaWJdYFLg76t2ihfflPZnM1LIQszWOsFDh2hhhAVF6k= +github.com/Kunde21/markdownfmt/v3 v3.1.0 h1:KiZu9LKs+wFFBQKhrZJrFZwtLnCCWJahL+S+E/3VnM0= github.com/Kunde21/markdownfmt/v3 v3.1.0/go.mod h1:tPXN1RTyOzJwhfHoon9wUr4HGYmWgVxSQN6VBJDkrVc= +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/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= +github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/MirrexOne/unqueryvet v1.5.3 h1:LpT3rsH+IY3cQddWF9bg4C7jsbASdGnrOSofY8IPEiw= github.com/MirrexOne/unqueryvet v1.5.3/go.mod h1:fs9Zq6eh1LRIhsDIsxf9PONVUjYdFHdtkHIgZdJnyPU= +github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsuj3piCMx4= github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo= +github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw= github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= +github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/chroma/v2 v2.23.1 h1:nv2AVZdTyClGbVQkIzlDm/rnhk1E9bU9nXwmZ/Vk/iY= github.com/alecthomas/chroma/v2 v2.23.1/go.mod h1:NqVhfBR0lte5Ouh3DcthuUCTUpDC9cxBOfyMbMQPs3o= +github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsrxJb4Aq31NLkU= github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E= +github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs= +github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= 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.6 h1:ME3Qef1/KIKr3kWX3nti3hhgNxw6aqN5pZmQiFSsuzQ= github.com/alexkohler/nakedret/v2 v2.0.6/go.mod h1:l3RKju/IzOMQHmsEvXwkqMDzHHvurNQfAgE1eVmT40Q= +github.com/alexkohler/prealloc v1.0.2 h1:MPo8cIkGkZytq7WNH9UHv3DIX1mPz1RatPXnZb0zHWQ= github.com/alexkohler/prealloc v1.0.2/go.mod h1:fT39Jge3bQrfA7nPMDngUfvUbQGQeJyGQnR+913SCig= +github.com/alfatraining/structtag v1.0.0 h1:2qmcUqNcCoyVJ0up879K614L9PazjBSFruTB0GOFjCc= github.com/alfatraining/structtag v1.0.0/go.mod h1:p3Xi5SwzTi+Ryj64DqjLWz7XurHxbGsq6y3ubePJPus= +github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= +github.com/alingse/nilnesserr v0.2.0 h1:raLem5KG7EFVb4UIDAXgrv3N2JIaffeKNtcEXkEWd/w= github.com/alingse/nilnesserr v0.2.0/go.mod h1:1xJPrXonEtX7wyTq8Dytns5P2hNzoWymVUIaKm4HNFg= +github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= +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/ashanbrown/forbidigo/v2 v2.3.0 h1:OZZDOchCgsX5gvToVtEBoV2UWbFfI6RKQTir2UZzSxo= github.com/ashanbrown/forbidigo/v2 v2.3.0/go.mod h1:5p6VmsG5/1xx3E785W9fouMxIOkvY2rRV9nMdWadd6c= +github.com/ashanbrown/makezero/v2 v2.1.0 h1:snuKYMbqosNokUKm+R6/+vOPs8yVAi46La7Ck6QYSaE= github.com/ashanbrown/makezero/v2 v2.1.0/go.mod h1:aEGT/9q3S8DHeE57C88z2a6xydvgx8J5hgXIGWgo0MY= +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/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= 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/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5w= github.com/bkielbasa/cyclop v1.2.3/go.mod h1:kHTwA9Q0uZqOADdupvcFJQtp/ksSnytRMe8ztxG8Fuo= +github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= +github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE= github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bombsimon/wsl/v4 v4.7.0 h1:1Ilm9JBPRczjyUs6hvOPKvd7VL1Q++PL8M0SXBDf+jQ= github.com/bombsimon/wsl/v4 v4.7.0/go.mod h1:uV/+6BkffuzSAVYD+yGyld1AChO7/EuLrCF/8xTiapg= +github.com/bombsimon/wsl/v5 v5.6.0 h1:4z+/sBqC5vUmSp1O0mS+czxwH9+LKXtCWtHH9rZGQL8= github.com/bombsimon/wsl/v5 v5.6.0/go.mod h1:Uqt2EfrMj2NV8UGoN1f1Y3m0NpUVCsUdrNCdet+8LvU= +github.com/breml/bidichk v0.3.3 h1:WSM67ztRusf1sMoqH6/c4OBCUlRVTKq+CbSeo0R17sE= github.com/breml/bidichk v0.3.3/go.mod h1:ISbsut8OnjB367j5NseXEGGgO/th206dVa427kR8YTE= +github.com/breml/errchkjson v0.4.1 h1:keFSS8D7A2T0haP9kzZTi7o26r7kE3vymjZNeNDRDwg= github.com/breml/errchkjson v0.4.1/go.mod h1:a23OvR6Qvcl7DG/Z4o0el6BRAjKnaReoPQFciAl9U3s= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= +github.com/butuzov/ireturn v0.4.0 h1:+s76bF/PfeKEdbG8b54aCocxXmi0wvYdOVsWxVO7n8E= github.com/butuzov/ireturn v0.4.0/go.mod h1:ghI0FrCmap8pDWZwfPisFD1vEc56VKH4NpQUxDHta70= +github.com/butuzov/mirror v1.3.0 h1:HdWCXzmwlQHdVhwvsfBb2Au0r3HyINry3bDWLYXiKoc= github.com/butuzov/mirror v1.3.0/go.mod h1:AEij0Z8YMALaq4yQj9CPPVYOyJQyiexpQEQgihajRfI= +github.com/catenacyber/perfsprint v0.10.1 h1:u7Riei30bk46XsG8nknMhKLXG9BcXz3+3tl/WpKm0PQ= github.com/catenacyber/perfsprint v0.10.1/go.mod h1:DJTGsi/Zufpuus6XPGJyKOTMELe347o6akPvWG9Zcsc= +github.com/ccojocar/zxcvbn-go v1.0.4 h1:FWnCIRMXPj43ukfX000kvBZvV6raSxakYr1nzyNrUcc= github.com/ccojocar/zxcvbn-go v1.0.4/go.mod h1:3GxGX+rHmueTUMvm5ium7irpyjmm7ikxYFOSJB21Das= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charithe/durationcheck v0.0.11 h1:g1/EX1eIiKS57NTWsYtHDZ/APfeXKhye1DidBcABctk= github.com/charithe/durationcheck v0.0.11/go.mod h1:x5iZaixRNl8ctbM+3B2RrPG5t856TxRyVQEnbIEM2X4= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= +github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ= github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= 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/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs= github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/curioswitch/go-reassign v0.3.0 h1:dh3kpQHuADL3cobV/sSGETA8DOv457dwl+fbBAhrQPs= github.com/curioswitch/go-reassign v0.3.0/go.mod h1:nApPCCTtqLJN/s8HfItCcKV0jIPwluBOvZP+dsJGA88= +github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= +github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= +github.com/daixiang0/gci v0.13.7 h1:+0bG5eK9vlI08J+J/NWGbWPTNiXPG4WhNLJOkSxWITQ= github.com/daixiang0/gci v0.13.7/go.mod h1:812WVN6JLFY9S6Tv76twqmNqevN0pa3SX3nih0brVzQ= +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.1 h1:B4jJJDHelWcDhlRQxWeo0Npa/pYKBLrirAQoTN45txo= +github.com/dave/jennifer v1.7.1/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/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8= github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY= +github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58= +github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w= github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= 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= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q= github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +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/firefart/nonamedreturns v1.0.6 h1:vmiBcKV/3EqKY3ZiPxCINmpS431OcE1S47AQUwhrg8E= github.com/firefart/nonamedreturns v1.0.6/go.mod h1:R8NisJnSIpvPWheCq0mNRXJok6D8h7fagJTF8EMEwCo= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= 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.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= +github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1f+MzD0= github.com/ghostiam/protogetter v0.3.20/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI= +github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog= github.com/go-critic/go-critic v0.14.3/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM= +github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= +github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60= +github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -140,28 +235,51 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= +github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= 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 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +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/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ= +github.com/go-toolsmith/astequal v1.2.0 h1:3Fs3CYZ1k9Vo4FzFhwwewC3CHISHDnVUPC4x0bI2+Cw= github.com/go-toolsmith/astequal v1.2.0/go.mod h1:c8NZ3+kSFtFY/8lPso4v8LuJjdJiUFVnSuU3s0qrrDY= +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/pkgload v1.2.2/go.mod h1:R2hxLNRKuAsiXCo2i5J6ZQPhnPMOVtU+f0arbFPWCus= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +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-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro= github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY= github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/godoc-lint/godoc-lint v0.11.2 h1:Bp0FkJWoSdNsBikdNgIcgtaoo+xz6I/Y9s5WSBQUeeM= github.com/godoc-lint/godoc-lint v0.11.2/go.mod h1:iVpGdL1JCikNH2gGeAn3Hh+AgN5Gx/I/cxV+91L41jo= +github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw= github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 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= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -185,17 +303,29 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= 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/golangci/asciicheck v0.5.0 h1:jczN/BorERZwK8oiFBOGvlGPknhvq0bjnysTj4nUfo0= github.com/golangci/asciicheck v0.5.0/go.mod h1:5RMNAInbNFw2krqN6ibBxN/zfRFa9S6tA1nPdM0l8qQ= +github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 h1:WUvBfQL6EW/40l6OmeSBYQJNSif4O11+bmWEz+C7FYw= github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32/go.mod h1:NUw9Zr2Sy7+HxzdjIULge71wI6yEg1lWQr7Evcu8K0E= +github.com/golangci/go-printf-func-name v0.1.1 h1:hIYTFJqAGp1iwoIfsNTpoq1xZAarogrvjO9AfiW3B4U= github.com/golangci/go-printf-func-name v0.1.1/go.mod h1:Es64MpWEZbh0UBtTAICOZiB+miW53w/K9Or/4QogJss= +github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE= github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY= +github.com/golangci/golangci-lint/v2 v2.10.1 h1:flhw5Px6ojbLyEFzXvJn5B2HEdkkRlkhE1SnmCbQBiE= github.com/golangci/golangci-lint/v2 v2.10.1/go.mod h1:dBsrOk6zj0vDhlTv+IiJGqkDokR24IVTS7W3EVfPTQY= +github.com/golangci/golines v0.15.0 h1:Qnph25g8Y1c5fdo1X7GaRDGgnMHgnxh4Gk4VfPTtRx0= github.com/golangci/golines v0.15.0/go.mod h1:AZjXd23tbHMpowhtnGlj9KCNsysj72aeZVVHnVcZx10= +github.com/golangci/misspell v0.8.0 h1:qvxQhiE2/5z+BVRo1kwYA8yGz+lOlu5Jfvtx2b04Jbg= github.com/golangci/misspell v0.8.0/go.mod h1:WZyyI2P3hxPY2UVHs3cS8YcllAeyfquQcKfdeE9AFVg= +github.com/golangci/plugin-module-register v0.1.2 h1:e5WM6PO6NIAEcij3B053CohVp3HIYbzSuP53UAYgOpg= github.com/golangci/plugin-module-register v0.1.2/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw= +github.com/golangci/revgrep v0.8.0 h1:EZBctwbVd0aMeRnNUsFogoyayvKHyxlV3CdUA46FX2s= github.com/golangci/revgrep v0.8.0/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k= +github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e h1:ai0EfmVYE2bRA5htgAG9r7s3tHsfjIhN98WshBTJ9jM= github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e/go.mod h1:Vrn4B5oR9qRwM+f54koyeH3yzphlecwERs0el27Fr/s= +github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e h1:gD6P7NEo7Eqtt0ssnqSJNNndxe69DOQ24A5h7+i3KpM= github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e/go.mod h1:h+wZwLjUTJnm/P2rwlbJdRPZXOzaT36/FwnPnY2inzc= 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= @@ -210,6 +340,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -222,54 +353,93 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc= +github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gordonklaus/ineffassign v0.2.0 h1:Uths4KnmwxNJNzq87fwQQDDnbNb7De00VOk9Nu0TySs= github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8IT3a59vmZp5Y9Lw= +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.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= +github.com/gostaticanalysis/comment v1.5.0 h1:X82FLl+TswsUMpMh17srGRuKaaXprTaytmEpgnKIDu8= github.com/gostaticanalysis/comment v1.5.0/go.mod h1:V6eb3gpCv9GNVqb6amXzEUX3jXLVK/AdA+IrAMSqvEc= +github.com/gostaticanalysis/forcetypeassert v0.2.0 h1:uSnWrrUEYDr86OCxWa4/Tp2jeYDlogZiZHzGkWFefTk= github.com/gostaticanalysis/forcetypeassert v0.2.0/go.mod h1:M5iPavzE9pPqWyeiVXSFghQjljW1+l/Uke3PXHS6ILY= +github.com/gostaticanalysis/nilerr v0.1.2 h1:S6nk8a9N8g062nsx63kUkF6AzbHGw7zzyHMcpu52xQU= github.com/gostaticanalysis/nilerr v0.1.2/go.mod h1:A19UHhoY3y8ahoL7YKz6sdjDtduwTSI4CsymaC2htPA= github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= +github.com/gostaticanalysis/testutil v0.5.0 h1:Dq4wT1DdTwTGCQQv3rl3IvD5Ld0E6HiY+3Zh0sUGqw8= +github.com/gostaticanalysis/testutil v0.5.0/go.mod h1:OLQSbuM6zw2EvCcXTz1lVq5unyoNft372msDY0nY5Hs= +github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU= 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= +github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +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 v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo= github.com/hashicorp/go-immutable-radix/v2 v2.1.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw= 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-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4= github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/hc-install v0.9.2 h1:v80EtNX4fCVHqzL9Lg/2xkp62bbvQMnvPQ0G+OmtO24= github.com/hashicorp/hc-install v0.9.2/go.mod h1:XUqBQNnuT4RsxoxiM9ZaUk0NX8hi2h+Lb6/c0OZnC/I= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/terraform-exec v0.24.0 h1:mL0xlk9H5g2bn0pPF6JQZk5YlByqSqrO5VoaNtAf8OE= github.com/hashicorp/terraform-exec v0.24.0/go.mod h1:lluc/rDYfAhYdslLJQg3J0oDqo88oGQAdHR+wDqFvo4= +github.com/hashicorp/terraform-json v0.27.2 h1:BwGuzM6iUPqf9JYM/Z4AF1OJ5VVJEEzoKST/tRDBJKU= github.com/hashicorp/terraform-json v0.27.2/go.mod h1:GzPLJ1PLdUG5xL6xn1OXWIjteQRT2CNT9o/6A9mi9hE= +github.com/hashicorp/terraform-plugin-codegen-framework v0.4.1 h1:eaI/3dsu2T5QAXbA+7N+B+UBj20GdtYnsRuYypKh3S4= github.com/hashicorp/terraform-plugin-codegen-framework v0.4.1/go.mod h1:kpYM23L7NtcfaQdWAN0QFkV/lU0w16qJ2ddAPCI4zAg= +github.com/hashicorp/terraform-plugin-codegen-openapi v0.3.0 h1:IKpc337XKk50QyQPSxLrHwdqSo1E2XqCMxFkWsZcTvc= github.com/hashicorp/terraform-plugin-codegen-openapi v0.3.0/go.mod h1:tT6wl80h7nsMBw+1yZRgJXi+Ys85PUai11weDqysvp4= +github.com/hashicorp/terraform-plugin-codegen-spec v0.2.0 h1:91dQG1A/DxP6vRz9GiytDTrZTXDbhHPvmpYnAyWA/Vw= github.com/hashicorp/terraform-plugin-codegen-spec v0.2.0/go.mod h1:fywrEKpordQypmAjz/HIfm2LuNVmyJ6KDe8XT9GdJxQ= +github.com/hashicorp/terraform-plugin-docs v0.24.0 h1:YNZYd+8cpYclQyXbl1EEngbld8w7/LPOm99GD5nikIU= github.com/hashicorp/terraform-plugin-docs v0.24.0/go.mod h1:YLg+7LEwVmRuJc0EuCw0SPLxuQXw5mW8iJ5ml/kvi+o= +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.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/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.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +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/jgautheron/goconst v1.8.2 h1:y0XF7X8CikZ93fSNT6WBTb/NElBu9IjaY7CCYQrCMX4= github.com/jgautheron/goconst v1.8.2/go.mod h1:A0oxgBCHy55NQn6sYpO7UdnA9p+h7cPtoOZUmvNIako= +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/jjti/go-spancheck v0.6.5 h1:lmi7pKxa37oKYIMScialXUK6hP3iY5F1gu+mLBPgYB8= github.com/jjti/go-spancheck v0.6.5/go.mod h1:aEogkeatBrbYsyW6y5TgDfihCulDYciL1B7rG2vSsrU= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= @@ -281,175 +451,297 @@ 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/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.2.0 h1:y+MJN/UdL63QbFJHws9BVC5RpA2iq0kpjrFajTGivjQ= github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY= +github.com/karamaru-alpha/copyloopvar v1.2.2 h1:yfNQvP9YaGQR7VaWLYcfZUlRP2eo2vhExWKxD/fP6q0= github.com/karamaru-alpha/copyloopvar v1.2.2/go.mod h1:oY4rGZqZ879JkJMtX3RRkcXRkmUvH0x35ykgaKgsgJY= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kisielk/errcheck v1.9.0 h1:9xt1zI9EBfcYBvdU1nVrzMzzUPUtPKs9bVSIM3TAb3M= github.com/kisielk/errcheck v1.9.0/go.mod h1:kQxWMMVZgIkDq7U8xtG/n2juOjbLgZtedi0D+/VL/i8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kkHAIKE/contextcheck v1.1.6 h1:7HIyRcnyzxL9Lz06NGhiKvenXq7Zw6Q0UQu/ttjfJCE= github.com/kkHAIKE/contextcheck v1.1.6/go.mod h1:3dDbMRNBFaq8HFXWC1JyvDSPm43CmE6IuHam8Wr0rkg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kulti/thelper v0.7.1 h1:fI8QITAoFVLx+y+vSyuLBP+rcVIB8jKooNSCT2EiI98= github.com/kulti/thelper v0.7.1/go.mod h1:NsMjfQEy6sd+9Kfw8kCP61W1I0nerGSYSFnGaxQkcbs= +github.com/kunwardeep/paralleltest v1.0.15 h1:ZMk4Qt306tHIgKISHWFJAO1IDQJLc6uDyJMLyncOb6w= github.com/kunwardeep/paralleltest v1.0.15/go.mod h1:di4moFqtfz3ToSKxhNjhOZL+696QtJGCFe132CbBLGk= +github.com/lasiar/canonicalheader v1.1.2 h1:vZ5uqwvDbyJCnMhmFYimgMZnJMjwljN5VGY0VKbMXb4= github.com/lasiar/canonicalheader v1.1.2/go.mod h1:qJCeLFS0G/QlLQ506T+Fk/fWMa2VmBUiEI2cuMK4djI= +github.com/ldez/exptostd v0.4.5 h1:kv2ZGUVI6VwRfp/+bcQ6Nbx0ghFWcGIKInkG/oFn1aQ= github.com/ldez/exptostd v0.4.5/go.mod h1:QRjHRMXJrCTIm9WxVNH6VW7oN7KrGSht69bIRwvdFsM= +github.com/ldez/gomoddirectives v0.8.0 h1:JqIuTtgvFC2RdH1s357vrE23WJF2cpDCPFgA/TWDGpk= github.com/ldez/gomoddirectives v0.8.0/go.mod h1:jutzamvZR4XYJLr0d5Honycp4Gy6GEg2mS9+2YX3F1Q= +github.com/ldez/grignotin v0.10.1 h1:keYi9rYsgbvqAZGI1liek5c+jv9UUjbvdj3Tbn5fn4o= github.com/ldez/grignotin v0.10.1/go.mod h1:UlDbXFCARrXbWGNGP3S5vsysNXAPhnSuBufpTEbwOas= +github.com/ldez/structtags v0.6.1 h1:bUooFLbXx41tW8SvkfwfFkkjPYvFFs59AAMgVg6DUBk= github.com/ldez/structtags v0.6.1/go.mod h1:YDxVSgDy/MON6ariaxLF2X09bh19qL7MtGBN5MrvbdY= +github.com/ldez/tagliatelle v0.7.2 h1:KuOlL70/fu9paxuxbeqlicJnCspCRjH0x8FW+NfgYUk= github.com/ldez/tagliatelle v0.7.2/go.mod h1:PtGgm163ZplJfZMZ2sf5nhUT170rSuPgBimoyYtdaSI= +github.com/ldez/usetesting v0.5.0 h1:3/QtzZObBKLy1F4F8jLuKJiKBjjVFi1IavpoWbmqLwc= github.com/ldez/usetesting v0.5.0/go.mod h1:Spnb4Qppf8JTuRgblLrEWb7IE6rDmUpGvxY3iRrzvDQ= +github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY= github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA= +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/macabu/inamedparam v0.2.0 h1:VyPYpOc10nkhI2qeNUdh3Zket4fcZjEWe35poddBCpE= github.com/macabu/inamedparam v0.2.0/go.mod h1:+Pee9/YfGe5LJ62pYXqB89lJ+0k5bsR8Wgz/C0Zlq3U= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/manuelarte/embeddedstructfieldcheck v0.4.0 h1:3mAIyaGRtjK6EO9E73JlXLtiy7ha80b2ZVGyacxgfww= github.com/manuelarte/embeddedstructfieldcheck v0.4.0/go.mod h1:z8dFSyXqp+fC6NLDSljRJeNQJJDWnY7RoWFzV3PC6UM= +github.com/manuelarte/funcorder v0.5.0 h1:llMuHXXbg7tD0i/LNw8vGnkDTHFpTnWqKPI85Rknc+8= github.com/manuelarte/funcorder v0.5.0/go.mod h1:Yt3CiUQthSBMBxjShjdXMexmzpP8YGvGLjrxJNkO2hA= +github.com/maratori/testableexamples v1.0.1 h1:HfOQXs+XgfeRBJ+Wz0XfH+FHnoY9TVqL6Fcevpzy4q8= github.com/maratori/testableexamples v1.0.1/go.mod h1:XE2F/nQs7B9N08JgyRmdGjYVGqxWwClLPCGSQhXQSrQ= +github.com/maratori/testpackage v1.1.2 h1:ffDSh+AgqluCLMXhM19f/cpvQAKygKAJXFl9aUjmbqs= github.com/maratori/testpackage v1.1.2/go.mod h1:8F24GdVDFW5Ew43Et02jamrVMNXLUNaOynhDssITGfc= +github.com/matoous/godox v1.1.0 h1:W5mqwbyWrwZv6OQ5Z1a/DHGMOvXYCBP3+Ht7KMoJhq4= github.com/matoous/godox v1.1.0/go.mod h1:jgE/3fUXiTurkdHOLT5WEkThTSuE7yxHv5iWPa80afs= +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.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mgechev/revive v1.14.0 h1:CC2Ulb3kV7JFYt+izwORoS3VT/+Plb8BvslI/l1yZsc= github.com/mgechev/revive v1.14.0/go.mod h1:MvnujelCZBZCaoDv5B3foPo6WWgULSSFxvfxp7GsPfo= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +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/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.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI= github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U= +github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= 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/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= +github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhKRf3Swg= github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= +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.23.0 h1:x3o4DGYOWbBMP/VdNQKgSj+25aJKx2Pe6lHr8gBcgf8= github.com/nunnatsa/ginkgolinter v0.23.0/go.mod h1:9qN1+0akwXEccwV1CAcCDfcoBlWXHB+ML9884pL4SZ4= 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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +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.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI= +github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= 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.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28= +github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= +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/pb33f/libopenapi v0.15.0 h1:AoBYIY3HXqDDF8O9kcudlqWaRFZZJmgtueE649oHzIw= github.com/pb33f/libopenapi v0.15.0/go.mod h1:m+4Pwri31UvcnZjuP8M7TlbR906DXJmMvYsbis234xg= +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.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= +github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/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 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/quasilyte/go-ruleguard v0.4.5 h1:AGY0tiOT5hJX9BTdx/xBdoCubQUAE2grkqY2lSwvZcA= github.com/quasilyte/go-ruleguard v0.4.5/go.mod h1:Vl05zJ538vcEEwu16V/Hdu7IYZWyKSwIy4c88Ro1kRE= +github.com/quasilyte/go-ruleguard/dsl v0.3.23 h1:lxjt5B6ZCiBeeNO8/oQsegE6fLeCzuMRoVWSkXC4uvY= github.com/quasilyte/go-ruleguard/dsl v0.3.23/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +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/raeperd/recvcheck v0.2.0 h1:GnU+NsbiCqdC2XX5+vMZzP+jAJC5fht7rcVTAhX74UI= github.com/raeperd/recvcheck v0.2.0/go.mod h1:n04eYkwIR0JbgD73wT8wL4JjPC3wm0nFtzBnWNocnYU= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.4.1 h1:eWC8eUMNZ/wM/PWuZBv7JxxqT5fiIKSIyTvjb7Elr+g= github.com/ryancurrah/gomodguard v1.4.1/go.mod h1:qnMJwV1hX9m+YJseXEBhd2s90+1Xn6x9dLz11ualI1I= +github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= +github.com/sanposhiho/wastedassign/v2 v2.1.0 h1:crurBF7fJKIORrV85u9UUpePDYGWnwvv3+A96WvwXT0= github.com/sanposhiho/wastedassign/v2 v2.1.0/go.mod h1:+oSmSC+9bQ+VUAxA66nBb0Z7N8CK7mscKTDYC6aIek4= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ= github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= +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.29.0 h1:8J0MoRrw4/NAXtjQqTHrbW9NN+3iMf7Knkq057v4XOQ= github.com/sashamelentyev/usestdlibvars v1.29.0/go.mod h1:8PpnjHMk5VdeWlVb4wCdrB8PNbLqZ3wBZTZWkrpZZL8= +github.com/securego/gosec/v2 v2.23.0 h1:h4TtF64qFzvnkqvsHC/knT7YC5fqyOCItlVR8+ptEBo= github.com/securego/gosec/v2 v2.23.0/go.mod h1:qRHEgXLFuYUDkI2T7W7NJAmOkxVhkR0x9xyHOIcMNZ0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= 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.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g= +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/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= +github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= +github.com/sonatard/noctx v0.4.0 h1:7MC/5Gg4SQ4lhLYR6mvOP6mQVSxCrdyiExo7atBs27o= github.com/sonatard/noctx v0.4.0/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas= +github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0= github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +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 v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= +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 v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +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.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g= github.com/stbenjam/no-sprintf-host-port v0.3.1/go.mod h1:ODbZesTCHMVKthBHskvUUexdcNHAQRXk9NpSsL8p/HQ= 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.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= 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.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +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.5.4 h1:u1ww+gqpRLiIA16yF2PV1CV1n/X3zhyezbNXC3E14Sg= github.com/tetafro/godot v1.5.4/go.mod h1:eOkMrVQurDui411nBY2FA05EYH01r14LuWY/NrVDVcU= +github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk= github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460= +github.com/timonwong/loggercheck v0.11.0 h1:jdaMpYBl+Uq9mWPXv1r8jc5fC3gyXx4/WGwTnnNKn4M= github.com/timonwong/loggercheck v0.11.0/go.mod h1:HEAWU8djynujaAVX7QI65Myb8qgfcZ1uKbdpg3ZzKl8= +github.com/tomarrell/wrapcheck/v2 v2.12.0 h1:H/qQ1aNWz/eeIhxKAFvkfIA+N7YDvq6TWVFL27Of9is= github.com/tomarrell/wrapcheck/v2 v2.12.0/go.mod h1:AQhQuZd0p7b6rfW+vUwHm5OMCGgp63moQ9Qr/0BpIWo= +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/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLkI= github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA= +github.com/ultraware/whitespace v0.2.0 h1:TYowo2m9Nfj1baEQBjuHzvMRbp19i+RCcRYrSWoFa+g= github.com/ultraware/whitespace v0.2.0/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= +github.com/uudashr/gocognit v1.2.0 h1:3BU9aMr1xbhPlvJLSydKwdLN3tEUUrzPSSM8S4hDYRA= github.com/uudashr/gocognit v1.2.0/go.mod h1:k/DdKPI6XBZO1q7HgoV2juESI2/Ofj9AcHPZhBBdrTU= +github.com/uudashr/iface v1.4.1 h1:J16Xl1wyNX9ofhpHmQ9h9gk5rnv2A6lX/2+APLTo0zU= github.com/uudashr/iface v1.4.1/go.mod h1:pbeBPlbuU2qkNDn0mmfrxP2X+wjPMIQAy+r1MBXSXtg= +github.com/vmware-labs/yaml-jsonpath v0.3.2 h1:/5QKeCBGdsInyDCyVNLbXyilb61MXGi9NP674f9Hobk= github.com/vmware-labs/yaml-jsonpath v0.3.2/go.mod h1:U6whw1z03QyqgWdgXxvVnQ90zN1BWz5V+51Ewf8k+rQ= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xen0n/gosmopolitan v1.3.0 h1:zAZI1zefvo7gcpbCOrPSHJZJYA9ZgLfJqtKzZ5pHqQM= github.com/xen0n/gosmopolitan v1.3.0/go.mod h1:rckfr5T6o4lBtM1ga7mLGKZmLxswUoH1zxHgNXOsEt4= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= +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.3.0 h1:JVDbMp08lVCP7Y6NP3qHroGAO6z2yGKQtS5JsjqtoFs= github.com/yeya24/promlinter v0.3.0/go.mod h1:cDfJQQYv9uYciW60QT0eeHlFodotkYZlL+YcPQN+mW4= +github.com/ykadowak/zerologlint v0.1.5 h1:Gy/fMz1dFQN9JZTPjv1hxEk+sRWm05row04Yoolgdiw= github.com/ykadowak/zerologlint v0.1.5/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= @@ -458,22 +750,38 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU= github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= +github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= +github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0= github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U= +gitlab.com/bosi/decorder v0.4.2 h1:qbQaV3zgwnBZ4zPMhGLW4KZe7A7NwxEhJx39R3shffo= gitlab.com/bosi/decorder v0.4.2/go.mod h1:muuhHoaJkA9QLcYHq4Mj8FJUwDZ+EirSHRiaTcTf6T8= +go-simpler.org/assert v0.9.0 h1:PfpmcSvL7yAnWyChSjOz6Sp6m9j5lyK8Ok9pEL31YkQ= +go-simpler.org/assert v0.9.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28= +go-simpler.org/musttag v0.14.0 h1:XGySZATqQYSEV3/YTy+iX+aofbZZllJaqwFWs+RTtSo= go-simpler.org/musttag v0.14.0/go.mod h1:uP8EymctQjJ4Z1kUnjX0u2l60WfUdQxCwSNKzE1JEOE= +go-simpler.org/sloglint v0.11.1 h1:xRbPepLT/MHPTCA6TS/wNfZrDzkGvCCqUv4Bdwc3H7s= go-simpler.org/sloglint v0.11.1/go.mod h1:2PowwiCOK8mjiF+0KGifVOT8ZsCNiFzvfyJeJOIt8MQ= +go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw= go.abhg.dev/goldmark/frontmatter v0.2.0/go.mod h1:XqrEkZuM57djk7zrlRUB02x8I5J0px76YjkOzhB4YlU= +go.augendre.info/arangolint v0.4.0 h1:xSCZjRoS93nXazBSg5d0OGCi9APPLNMmmLrC995tR50= go.augendre.info/arangolint v0.4.0/go.mod h1:l+f/b4plABuFISuKnTGD4RioXiCCgghv2xqst/xOvAA= +go.augendre.info/fatcontext v0.9.0 h1:Gt5jGD4Zcj8CDMVzjOJITlSb9cEch54hjRRlN3qDojE= go.augendre.info/fatcontext v0.9.0/go.mod h1:L94brOAT1OOUNue6ph/2HnwxoNlds9aXDF2FcUntbNw= 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= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -485,6 +793,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= 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= @@ -496,9 +805,11 @@ 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-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o= golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/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-20260209203927-2842357ff358 h1:qWFG1Dj7TBjOjOvhEOkmyGPVoquqUKnIU0lEVLp8xyk= golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358/go.mod h1:4Mzdyp/6jzw9auFDJ3OMF5qksa7UvPnzKqTVGcb04ms= 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= @@ -527,6 +838,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= 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= @@ -571,6 +883,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= +golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -592,6 +906,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= 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= @@ -650,7 +965,9 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0= golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548= 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= @@ -670,6 +987,7 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= 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= @@ -725,7 +1043,12 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= +golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM= +golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= +golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM= +golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -805,23 +1128,32 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/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.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +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/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= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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= 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= @@ -830,8 +1162,11 @@ 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.7.0 h1:w6WUp1VbkqPEgLz4rkBzH/CSU6HkoqNLp6GstyTx3lU= honnef.co/go/tools v0.7.0/go.mod h1:pm29oPxeP3P82ISxZDgIYeOaf9ta6Pi0EWvCFoLG2vc= +mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4= mvdan.cc/gofumpt v0.9.2/go.mod h1:iB7Hn+ai8lPvofHd9ZFGVg2GOr8sBUw1QUWjNbmIL/s= +mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 h1:ssMzja7PDPJV8FStj7hq9IKiuiKhgz9ErWw+m68e7DI= mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15/go.mod h1:4M5MMXl2kW6fivUT6yRGpLLPNfuGtU2Z0cPvFquGDYU= 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=