Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Merge master into CLOUDP-18958 #1384

Merged
merged 24 commits into from
Aug 14, 2023
Merged

fix: Merge master into CLOUDP-18958 #1384

merged 24 commits into from
Aug 14, 2023

Conversation

andreaangiolillo
Copy link
Collaborator

@andreaangiolillo andreaangiolillo commented Aug 14, 2023 •
edited
Loading

Description

This PR merges master into CLOUD-189585

Type of change:

  • Bug fix (non-breaking change which fixes an issue). Please, add the "bug" label to the PR.
  • New feature (non-breaking change which adds functionality). Please, add the "enhancement" label to the PR.
  • Breaking change (fix or feature that would cause existing functionality to not work as expected). Please, add the "breaking change" label to the PR.
  • This change requires a documentation update
  • Documentation fix/enhancement

Required Checklist:

  • I have signed the MongoDB CLA
  • I have read the contribution guidelines
  • I have added tests that prove my fix is effective or that my feature works per HashiCorp requirements
  • I have added any necessary documentation (if appropriate)
  • I have run make fmt and formatted my code

Further comments

dependabot bot and others added 21 commits August 2, 2023 07:08
@dependabot
Chore(deps): Bump github.com/gruntwork-io/terratest (#1358)
d7bb3be
@andreaangiolillo
feat: [Terraform] Parameter Add: Cloud Provider Access for Azure (#1343)
10685b5
@dependabot
Chore(deps): Bump github.com/aws/aws-sdk-go from 1.44.308 to 1.44.314 (…
2fcc0cd 
…#1360)
@andreaangiolillo
fix: add prefix to dependabot PR (#1361)
b032f46
@andreaangiolillo
fix: Update mongodbatlas_cloud_backup_schedule to add the ID field to…
be6c131 
… policyItems (#1357)
@andreaangiolillo
fix: Fix documentation for mongodbatlas_api_key (#1363)
3f9b826
@andreaangiolillo
fix: project_api_key data source missing project_assignment attribute (…
6aa966b 
…#1356)
@AgustinBettati @Zuhairahmed
doc: regenerate CHANGELOG.md after v1.11.0 pre-release (#1367)
6dac4fc 
* doc: regenerate CHANGELOG.md after v1.11.0 pre-release

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Create 1.11.0-upgrade-guide.html.markdown

---------

Co-authored-by: Zuhair Ahmed <zuhair.ahmed@mongodb.com>
@rsolovev
fix: typo in online archive "custom criteria" resource example (#1372)
4af9721
@Adelmar92
doc: INTMDB-927 fixed online archive docs (#1340)
0f80390 
* fixed online archive docs

* added example
@andreaangiolillo
feat: add githooks (#1373)
2a30752
@dependabot
chore: Bump github.com/aws/aws-sdk-go from 1.44.314 to 1.44.319 (#1375)
b71f54c
@andreaangiolillo
chore: [Terraform] Create github action to delete projects in the tes…
312bc3f 
…t env (#1378)
@andreaangiolillo
fix: clenaup-test-env.yml (#1379)
6312735
@andreaangiolillo
fix: null pointer error project data source (#1377)
639014c
@andreaangiolillo
fix: cluster outage tests (#1364)
544aa25
@andreaangiolillo
fix: Update deprecation message to 1.12.0 (#1381)
5185ff1
@andreaangiolillo
fix: How do I create Organization API Key with Organization Billing A…
a7c4fdc 
…dmin permission and Project Read Only for projects (#1369)
@andreaangiolillo
feat: Improve the release process (#1380)
0ec0dfa
@andreaangiolillo
merged master
e90e3b5
@andreaangiolillo
merged master
2c8bc34
@andreaangiolillo andreaangiolillo changed the title Merge master into cloudp 18958 fix: Merge master into CLOUDP-18958 Aug 14, 2023
andreaangiolillo
andreaangiolillo commented Aug 14, 2023
View reviewed changes
examples/atlas-api-key/create-and-assign-pak-seperately/main.tf
Comment on lines -14 to -16
api_keys {
api_key_id = mongodbatlas_api_key.orgKey1.api_key_id
role_names = ["GROUP_OWNER"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to fix the example after api_keys was removed from the project resource

@andreaangiolillo andreaangiolillo marked this pull request as ready for review August 14, 2023 11:14
@andreaangiolillo andreaangiolillo requested a review from a team as a code owner August 14, 2023 11:14
maastha
maastha approved these changes Aug 14, 2023
View reviewed changes
Copy link
Collaborator

@maastha maastha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andreaangiolillo andreaangiolillo merged commit 47526e4 into CLOUDP-189585-plugin-framework-migration Aug 14, 2023
21 checks passed
@andreaangiolillo andreaangiolillo deleted the merge_master_into_CLOUDP-18958 branch August 14, 2023 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maastha maastha maastha approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@andreaangiolillo @maastha @AgustinBettati @rsolovev @Adelmar92