Skip to content

Commit b7c5b5a

Browse files
svc-apix-BotmaasthalantoliCopilotoarbusi
authored
chore: Update CLOUDP-320243-dev-2.0.0 from master (#3473)
* chore: Creates temporary workflow to create a test tag using Github actions (#3440) * chore: Use rebase instead of merge to update dev branches (#3442) * use rebase instead of merge to update dev branches * Update .github/workflows/update-dev-branches.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * improve doc --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * chore: Updates repository to use supported Terraform versions (#3450) Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> * chore: JSON attributes in auto-generated resources (#3445) * stream_processor_api config * marshal JSON custom type * generate JSON custom type * formatGoFile * generated code * acc test * fix resouce.tmpl imports * revert changes to template * add import for custom types * wait * marshal tests * autogen tests * acc test with update of equivalent pipeline JSON * unmarshal test for custom type list * marshal error test * join acc tests * update generated code * fix marshal tests * fix delete config * same config as curated resource * chore: Use SP10 instead of default SP30 for stream_instance acceptance tests (#3453) * use SP10 instead of default SP30 for stream_instance * fix linter * Revert "fix linter" This reverts commit 46270c0. * chore: Replace fwtypes.JSONStringType with jsontypes.NormalizedType (#3452) * use JSON custom type * fix linter * chore: Updates Atlas Go SDK (#3446) * build(deps): bump go.mongodb.org/atlas-sdk * sdk changes --------- Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com> Co-authored-by: Oriol Arbusi Abadal <oriol.abadal@mongodb.com> * doc: Updates Terraform Compatibility Matrix documentation (#3449) Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> * chore: Remove `links` attributes in auto-generated resources (#3455) * remove links attributes * move comment * chore: Fixes broken link because of ending parenthesis. (#3448) * chore: Fixes broken link because of ending parenthesis. * using link markdown syntax to avoid broken link --------- Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> * feat: Adds `send_user_provided_resource_tags` attribute for `mongodbatlas_third_party_integration` (#3454) * add send_user_provided_resource_tags * changelog * fmt * docs and example * test * refactor * rename files * new line * chore: Updates CHANGELOG.md for #3454 * chore: Singletons in auto-generated resources (#3458) * initial auditing_api and maintenance_window_api generation * fix unmarshal for empty JSON * improve maintenance_window_api * checkDestroy in manual resource tests * explicit version header * check apiResp is not nil * support FixedRequestBody * auditing except delete * support FixedRequestBody * comment in MakeApiError * comment Unmarshal * use same flow as in SDK * rename FixedRequestBody to StaticRequestBody * codegen tests * revert unneeded test * lowering timeout value to ensure creation fails consistently (#3462) * doc: Fixing inconsistent docs in `federated_settings_org_role_mapping` associated to required attributes (#3460) * fixing inconsistent documentation * remove human-readable term in external_group_id attribute * fix: Avoids 0 itemsPerPage and pageNum when the args are missing in plural data sources (#3459) * chore: Add windsurf ignore * fix: Standardizes API params with WithParams pattern and IntPtr conversion * chore: Adds changelog file * refactor: use ListBackupExportJobsWithParams for export job listing * chore: Updates CHANGELOG.md for #3459 * chore: Docs team review improvements in dev branches (#3466) * TEMPORARY send to test channel * don't notify docs team if label skip-docs-notification * TEMPORARY doc change * add label skip label in update dev branches GHA * Revert "TEMPORARY doc change" This reverts commit de69883. * Revert "TEMPORARY send to test channel" This reverts commit c7e2746. * detect changes * don't create the PR is no new changes * fix linter * add step names * feat: Adds `users` attribute to `mongodbatlas_project` singular data source (#3439) * WIP * Fixed acceptance test * Added a comment * Added changelog * Update docs/data-sources/project.md * Update .changelog/3439.txt Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> * PR comments * Fix * Arguments fixed * Fix constant --------- Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com> Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> * feat: Adds users attribute to mongodbatlas_projects plural data source (#3451) * WIP * Fixed acceptance test * Added a comment * Added changelog * Added users attribute to projects data source * Added changelog and fixed docs * Factored out users schema * Refactored schemas and fixed test and doc * Minor code review suggestions and fixed doc --------- Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com> * chore: Update CLOUDP-320243-dev-2.0.0 from master (#3457) * chore: Creates temporary workflow to create a test tag using Github actions (#3440) * chore: Use rebase instead of merge to update dev branches (#3442) * use rebase instead of merge to update dev branches * Update .github/workflows/update-dev-branches.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * improve doc --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * chore: Updates repository to use supported Terraform versions (#3450) Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> * chore: JSON attributes in auto-generated resources (#3445) * stream_processor_api config * marshal JSON custom type * generate JSON custom type * formatGoFile * generated code * acc test * fix resouce.tmpl imports * revert changes to template * add import for custom types * wait * marshal tests * autogen tests * acc test with update of equivalent pipeline JSON * unmarshal test for custom type list * marshal error test * join acc tests * update generated code * fix marshal tests * fix delete config * same config as curated resource * chore: Use SP10 instead of default SP30 for stream_instance acceptance tests (#3453) * use SP10 instead of default SP30 for stream_instance * fix linter * Revert "fix linter" This reverts commit 46270c0. * chore: Replace fwtypes.JSONStringType with jsontypes.NormalizedType (#3452) * use JSON custom type * fix linter * chore: Updates Atlas Go SDK (#3446) * build(deps): bump go.mongodb.org/atlas-sdk * sdk changes --------- Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com> Co-authored-by: Oriol Arbusi Abadal <oriol.abadal@mongodb.com> * doc: Updates Terraform Compatibility Matrix documentation (#3449) Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> * chore: Remove `links` attributes in auto-generated resources (#3455) * remove links attributes * move comment * chore: Fixes broken link because of ending parenthesis. (#3448) * chore: Fixes broken link because of ending parenthesis. * using link markdown syntax to avoid broken link --------- Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> * feat: Adds `send_user_provided_resource_tags` attribute for `mongodbatlas_third_party_integration` (#3454) * add send_user_provided_resource_tags * changelog * fmt * docs and example * test * refactor * rename files * new line * chore: Updates CHANGELOG.md for #3454 * chore: Singletons in auto-generated resources (#3458) * initial auditing_api and maintenance_window_api generation * fix unmarshal for empty JSON * improve maintenance_window_api * checkDestroy in manual resource tests * explicit version header * check apiResp is not nil * support FixedRequestBody * auditing except delete * support FixedRequestBody * comment in MakeApiError * comment Unmarshal * use same flow as in SDK * rename FixedRequestBody to StaticRequestBody * codegen tests * revert unneeded test * lowering timeout value to ensure creation fails consistently (#3462) * doc: Fixing inconsistent docs in `federated_settings_org_role_mapping` associated to required attributes (#3460) * fixing inconsistent documentation * remove human-readable term in external_group_id attribute * fix: Avoids 0 itemsPerPage and pageNum when the args are missing in plural data sources (#3459) * chore: Add windsurf ignore * fix: Standardizes API params with WithParams pattern and IntPtr conversion * chore: Adds changelog file * refactor: use ListBackupExportJobsWithParams for export job listing * chore: Updates CHANGELOG.md for #3459 * feat: Adds `users` attribute to `mongodbatlas_project` singular data source (#3439) * WIP * Fixed acceptance test * Added a comment * Added changelog * Update docs/data-sources/project.md * Update .changelog/3439.txt Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> * PR comments * Fix * Arguments fixed * Fix constant --------- Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com> Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> * feat: Adds users attribute to mongodbatlas_projects plural data source (#3451) * WIP * Fixed acceptance test * Added a comment * Added changelog * Added users attribute to projects data source * Added changelog and fixed docs * Factored out users schema * Refactored schemas and fixed test and doc * Minor code review suggestions and fixed doc --------- Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com> --------- Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com> Co-authored-by: Oriol Arbusi Abadal <oriol.abadal@mongodb.com> Co-authored-by: Marco Suma <marco.suma@mongodb.com> Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> Co-authored-by: Espen Albert <EspenAlbert@users.noreply.github.com> Co-authored-by: Cristina Sánchez <c.sanchezprincipal@gmail.com> Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com> --------- Co-authored-by: maastha <122359335+maastha@users.noreply.github.com> Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com> Co-authored-by: Oriol Arbusi Abadal <oriol.abadal@mongodb.com> Co-authored-by: Marco Suma <marco.suma@mongodb.com> Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> Co-authored-by: Espen Albert <EspenAlbert@users.noreply.github.com> Co-authored-by: Cristina Sánchez <c.sanchezprincipal@gmail.com> Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com>
1 parent 1662e17 commit b7c5b5a

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

‎.github/workflows/notify-docs-team.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
check:
9-
if: github.event.pull_request.draft == false
9+
if: github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'skip-docs-notification')
1010
runs-on: ubuntu-latest
1111
outputs:
1212
files: ${{ steps.changes.outputs.files }}

‎.github/workflows/update-dev-branches.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,19 @@ jobs:
3131
contents: write
3232
pull-requests: write
3333
steps:
34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
34+
- name: Checkout repo
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3536
with:
3637
fetch-depth: 0
37-
- run: |
38+
39+
- name: Config Git
40+
run: |
3841
git config --local user.email svc-api-experience-integrations-escalation@mongodb.com
3942
git config --local user.name svc-apix-bot
4043
41-
- run: |
44+
- name: Rebase branch with master
45+
id: rebase-check
46+
run: |
4247
echo "Updating branch: ${{ matrix.branch }}"
4348
4449
if ! git ls-remote --heads origin ${{ matrix.branch }} | grep -q ${{ matrix.branch }}; then
@@ -70,23 +75,27 @@ jobs:
7075
fi
7176
fi
7277
73-
- uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
78+
- name: Create pull request
79+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
80+
if: steps.rebase-check.outputs.has-changes == 'true'
7481
with:
7582
token: ${{ secrets.APIX_BOT_PAT }}
7683
title: "chore: Update ${{ matrix.branch }} from master"
7784
commit-message: "Update ${{ matrix.branch }} from master"
7885
delete-branch: true
7986
branch: update-${{ matrix.branch }}-from-master
8087
base: ${{ matrix.branch }}
81-
body: "Automated update of ${{ matrix.branch }} branch with latest changes from master branch."
88+
body: "Automated update of `${{ matrix.branch }}` branch with latest changes from master branch."
89+
labels: "skip-docs-notification"
8290

8391
slack-notification:
8492
needs: update-branches
8593
if: ${{ !cancelled() && needs.update-branches.result == 'failure' }}
8694
runs-on: ubuntu-latest
8795
permissions: {}
8896
steps:
89-
- uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52
97+
- name: Send Slack notification on failure
98+
uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52
9099
with:
91100
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
92101
webhook-type: incoming-webhook

0 commit comments

Comments
 (0)