Skip to content

Commit eaa4779

Browse files
svc-apix-BotlantoliAgustinBettatimarcosumaoarbusi
authored
chore: Update CLOUDP-320243-dev-2.0.0 from master (#3435)
* chore: Fix clusterapi and add acceptance tests (#3412) * applyOverrides uses all path parts * complete clusterapi config * add acc tests * update generate code * use full path attributes * undo changes to applyOverrides * remove comment * fix test check * electable_specs is not an array * fix computed * Update tools/codegen/config.yml Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> * improve comment --------- Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> * chore: Adds guide on reasons and steps for deleting a BCP-enabled cluster (#3409) * chore: adds guide to explain how to delete cluster when BCP is enabled. * update content. * adds references to the resource and data source docs. * address comments. * address comments. * remove unnecessary newlines. * update autogen resources from openapi spec (#3418) * chore: Groups compliance scripts together and adds information of compliance process in the contributing guidelines (#3420) * refactor * fix * chore: Fix PATCH in auto-generated resources (#3421) * empty lists and sets in update * update tests * add autogen:"includejsonupdate" in autogen tool * support includejsonupdate * use fieldalignment in schema files * fix unit tests * reduce linter exceptions * build(deps): bump go.mongodb.org/atlas-sdk (#3423) Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com> * chore: Bump softprops/action-gh-release from 2.2.2 to 2.3.2 (#3414) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.2.2 to 2.3.2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@da05d55...72f2c25) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.3.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: Bump github.com/hashicorp/terraform-plugin-testing (#3413) Bumps [github.com/hashicorp/terraform-plugin-testing](https://github.com/hashicorp/terraform-plugin-testing) from 1.13.1 to 1.13.2. - [Release notes](https://github.com/hashicorp/terraform-plugin-testing/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-testing/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-plugin-testing@v1.13.1...v1.13.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-testing dependency-version: 1.13.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix TestAccConfigDSOrganization_noAccessShouldFail (#3426) * feat: Adds support for cluster_project_id field for stream_connection (#3424) * chore: Updates CHANGELOG.md for #3424 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com> Co-authored-by: Marco Suma <marco.suma@mongodb.com> Co-authored-by: Oriol <oriol.abadal@mongodb.com> Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kush Patel <66638373+kpatel71716@users.noreply.github.com>
1 parent ead1911 commit eaa4779

File tree

279 files changed

+1079
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+1079
-352
lines changed

‎.changelog/3424.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
data-source/mongodbatlas_stream_connection Adds `cluster_project_id` to allow connections to clusters in other projects within an organization
3+
```
4+
5+
```release-note:enhancement
6+
resource/mongodbatlas_stream_connection Adds `cluster_project_id` to allow connections to clusters in other projects within an organization
7+
```

‎.github/workflows/acceptance-tests-runner.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ jobs:
280280
- 'internal/provider/*.go'
281281
autogen:
282282
- 'internal/common/autogen/*.go'
283+
- 'internal/serviceapi/clusterapi/*.go'
283284
- 'internal/serviceapi/customdbroleapi/*.go'
284285
- 'internal/serviceapi/databaseuserapi/*.go'
285286
- 'internal/serviceapi/projectapi/*.go'
@@ -513,6 +514,7 @@ jobs:
513514
AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
514515
MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
515516
ACCTEST_PACKAGES: |
517+
./internal/serviceapi/clusterapi
516518
./internal/serviceapi/customdbroleapi
517519
./internal/serviceapi/databaseuserapi
518520
./internal/serviceapi/projectapi

‎.github/workflows/generate-augmented-sbom.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Generate PURLs from release artifacts
3333
run: |
34-
./scripts/generate-purls-from-release.sh "${{ inputs.release_version }}"
34+
./scripts/compliance/generate-purls-from-release.sh "${{ inputs.release_version }}"
3535
3636
- name: Generate SBOM with Silkbomb
3737
run: |
@@ -40,12 +40,11 @@ jobs:
4040
4141
- name: Get current date
4242
id: date
43-
run: |
44-
echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_ENV"
43+
run: echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
4544

4645
- name: Augment SBOM with Kondukto
4746
env:
48-
DATE: ${{ env.date }}
47+
DATE: ${{ steps.date.outputs.date }}
4948
RELEASE_VERSION: ${{ inputs.release_version }}
5049
run: |
5150
make augment-sbom
@@ -55,13 +54,13 @@ jobs:
5554
AUTHOR: ${{ github.actor }}
5655
VERSION: ${{ inputs.release_version }}
5756
AUGMENTED_REPORT: "true"
58-
run: ./scripts/gen-ssdlc-report.sh
57+
run: ./scripts/compliance/gen-ssdlc-report.sh
5958

6059
- name: Upload augmented SBOM as artifact
6160
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
6261
with:
6362
name: augmented_sbom_and_ssdlc_report
6463
path: |
65-
compliance/augmented-sbom-v${{ inputs.release_version }}-${{ env.date }}.json
66-
compliance/ssdlc-compliance-${{ inputs.release_version }}-${{ env.date }}.md
64+
compliance/augmented-sbom-v${{ inputs.release_version }}-${{ steps.date.outputs.date }}.json
65+
compliance/ssdlc-compliance-${{ inputs.release_version }}-${{ steps.date.outputs.date }}.md
6766
if-no-files-found: error

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
KONDUKTO_REPO: ${{ vars.KONDUKTO_REPO }}
183183
KONDUKTO_BRANCH_PREFIX: ${{ vars.KONDUKTO_BRANCH_PREFIX }}
184184
- name: Upload SBOM as release artifact
185-
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
185+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
186186
with:
187187
files: compliance/sbom.json
188188
tag_name: ${{ inputs.version_number }}
@@ -207,7 +207,7 @@ jobs:
207207
VERSION="${TAG#v}"
208208
AUTHOR="${{ github.actor }}"
209209
export AUTHOR VERSION
210-
./scripts/gen-ssdlc-report.sh
210+
./scripts/compliance/gen-ssdlc-report.sh
211211
file_to_commit: 'compliance/v*/ssdlc-compliance-*.md'
212212
commit_message: "chore: Update SSDLC report for ${{ inputs.version_number }}"
213213
apix_bot_pat: ${{ secrets.APIX_BOT_PAT }}

‎.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ linters:
108108
- gocritic
109109
text: "^hugeParam: req is heavy"
110110
- path: schema\.go # exclude rules for schema files as it's auto-genereated from OpenAPI spec
111-
text: fieldalignment|hugeParam|var-naming|ST1003|S1007|exceeds the maximum|too long|regexpSimplify|nolint
111+
text: var-naming|exceeds the maximum|regexpSimplify
112112
- path: (.+)\.go$
113113
text: declaration of ".*" shadows declaration at line .*
114114
formatters:

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
## (Unreleased)
22

3+
ENHANCEMENTS:
4+
5+
* data-source/mongodbatlas_stream_connection Adds `cluster_project_id` to allow connections to clusters in other projects within an organization ([#3424](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3424))
6+
* resource/mongodbatlas_stream_connection Adds `cluster_project_id` to allow connections to clusters in other projects within an organization ([#3424](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3424))
7+
38
## 1.36.0 (June 11, 2025)
49

510
FEATURES:

‎Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ change-lines:
224224

225225
.PHONY: gen-purls
226226
gen-purls: # Generate purls on linux os
227-
./scripts/generate-purls.sh
227+
./scripts/compliance/generate-purls.sh
228228

229229
.PHONY: generate-sbom
230230
generate-sbom: ## Generate SBOM
231-
./scripts/generate-sbom.sh
231+
./scripts/compliance/generate-sbom.sh
232232

233233
.PHONY: upload-sbom
234234
upload-sbom: ## Upload SBOM
235-
./scripts/upload-sbom.sh
235+
./scripts/compliance/upload-sbom.sh
236236

237237
.PHONY: augment-sbom
238238
augment-sbom: ## Augment SBOM
239-
./scripts/augment-sbom.sh
239+
./scripts/compliance/augment-sbom.sh

‎contributing/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ Thanks for your interest in contributing to MongoDB Atlas Terraform Provider, th
99
- [Changelog process](changelog-process.md)
1010
- [Atlas SDK](atlas-sdk.md)
1111
- [Enhanced Network Logging](network-logging.md)
12+
- [Compliance](compliance.md)

‎contributing/compliance.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Third Party Dependencies and Vulnerability Scanning
2+
3+
We scan our dependencies for vulnerabilities and incompatible licenses using [Snyk](https://snyk.io/).
4+
To run Snyk locally please follow their [CLI reference](https://support.snyk.io/hc/en-us/articles/360003812458-Getting-started-with-the-CLI).
5+
6+
We also use Kondukto to scan for third-party dependency vulnerabilities. Kondukto creates tickets in MongoDB's issue tracking system for any vulnerabilities found.
7+
8+
## SBOM and Compliance
9+
We generate Software Bill of Materials (SBOM) files for each release as part of MongoDB's SSDLC initiative. SBOM Lite files are automatically generated and included as release artifacts. Compliance reports are generated after each release and stored in the compliance/<release-version> directory.
10+
11+
Augmented SBOMs can be generated on customer request for any released version. This can only be done by MongoDB employees as it requires access to our GitHub workflow.
12+
13+
## Papertrail Integration
14+
All releases are recorded using a MongoDB-internal application called Papertrail. This records various pieces of information about releases, including the date and time of the release, who triggered the release (by pushing to Evergreen), and a checksum of each release file.
15+
16+
This is done automatically as part of the release.
17+
18+
## Release Artifact Signing
19+
All releases are signed automatically as part of the release process.

‎docs/data-sources/advanced_cluster (preview provider 2.0.0).md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ This page describes the **Preview for MongoDB Atlas Provider 2.0.0** of `mongodb
1010
<br> &#8226; Changes to cluster configurations can affect costs. Before making changes, please see [Billing](https://docs.atlas.mongodb.com/billing/).
1111
<br> &#8226; If your Atlas project contains a custom role that uses actions introduced in a specific MongoDB version, you cannot create a cluster with a MongoDB version less than that version unless you delete the custom role.
1212

13+
-> **NOTE:** To delete an Atlas cluster that has an associated `mongodbatlas_cloud_backup_schedule` resource and an enabled Backup Compliance Policy, first instruct Terraform to remove the `mongodbatlas_cloud_backup_schedule` resource from the state and then use Terraform to delete the cluster. To learn more, see [Delete a Cluster with a Backup Compliance Policy](../guides/delete-cluster-with-backup-compliance-policy.md).
14+
1315
**NOTE:** This data source also includes Flex clusters.
1416

1517
## Example Usage

0 commit comments

Comments
 (0)