Skip to content

INTMDB-648: Errors when creating or importing timeseries online archive #1114

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
Merged
merged 5 commits into from
Mar 28, 2023
Merged

INTMDB-648: Errors when creating or importing timeseries online archive #1114

merged 5 commits into from
Mar 28, 2023

Conversation

martinstibbe
Copy link
Contributor

@martinstibbe martinstibbe commented Mar 27, 2023 •
edited
Loading

Description

Errors when creating or importing timeseries online archive. Add support for collection_type

Link to any related issue(s):
#1081

Type of change:

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • 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

@martinstibbe martinstibbe requested a review from a team as a code owner March 27, 2023 17:22
evertsd
evertsd reviewed Mar 27, 2023
View reviewed changes
mongodbatlas/resource_mongodbatlas_online_archive.go Outdated
// nothing to do, let's go
if !paused && !criteria {
if !paused && !criteria && collectionType {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be && !collectionType?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch updated

@Zuhairahmed Zuhairahmed self-requested a review March 27, 2023 20:40
Zuhairahmed
Zuhairahmed approved these changes Mar 27, 2023
View reviewed changes
Copy link
Contributor

@Zuhairahmed Zuhairahmed left a comment

Choose a reason for hiding this comment

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

Few minor comments below and double check on potentially missing test harness / data source for plural. otherwise LGTM. feel free to merge after below edits

mongodbatlas/data_source_mongodbatlas_online_archive.go
@@ -83,6 +83,10 @@ func schemaOnlineArchive() map[string]*schema.Schema {
Type: schema.TypeString,
Computed: true,
},
"collection_type": {
Copy link
Contributor

Choose a reason for hiding this comment

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

are we missing similar updates to data source mongodbatlas online archives? https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs/data-sources/online_archives

Copy link
Contributor Author

Choose a reason for hiding this comment

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

plural and singular all in same file will refactor in upcoming release

mongodbatlas/data_source_mongodbatlas_online_archive.go
@@ -83,6 +83,10 @@ func schemaOnlineArchive() map[string]*schema.Schema {
Type: schema.TypeString,
Computed: true,
},
"collection_type": {
Type: schema.TypeString,
Computed: true,
Copy link
Contributor

Choose a reason for hiding this comment

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

also looks like we are missing _test.go file, i.e. data_source_mongodbatlas_online_archive_test.go. if true can you add it as part of this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

same resource has data source tests combined will fix in later release

andreaangiolillo
andreaangiolillo approved these changes Mar 28, 2023
View reviewed changes
Copy link
Collaborator

@andreaangiolillo andreaangiolillo left a comment

Choose a reason for hiding this comment

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

LGTM

@martinstibbe martinstibbe merged commit 5c24844 into release-staging-v.1.8.2 Mar 28, 2023
@martinstibbe martinstibbe deleted the INTMDB-648 branch March 28, 2023 13:30
Zuhairahmed added a commit that referenced this pull request Mar 28, 2023
@martinstibbe @dependabot
@evertsd @Zuhairahmed
Release staging v.1.8.2 (#1115)
c62f352 
* INTMDB-359: GCP Terraform Provider Version Upgrade Refactoring (#1098)

* Chore(deps): Bump github.com/aws/aws-sdk-go from 1.40.56 to 1.44.216 (#1094)

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.40.56 to 1.44.216.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.40.56...v1.44.216)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Chore(deps): Bump go.mongodb.org/atlas from 0.21.0 to 0.23.1 (#1092)

Bumps [go.mongodb.org/atlas](https://github.com/mongodb/go-client-mongodb-atlas) from 0.21.0 to 0.23.1.
- [Release notes](https://github.com/mongodb/go-client-mongodb-atlas/releases)
- [Changelog](https://github.com/mongodb/go-client-mongodb-atlas/blob/master/CHANGELOG.md)
- [Commits](mongodb/go-client-mongodb-atlas@v0.21.0...v0.23.1)

---
updated-dependencies:
- dependency-name: go.mongodb.org/atlas
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Chore(deps): Bump golang.org/x/net from 0.1.0 to 0.7.0 (#1071)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.1.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Remove AWS Google terraform provider tests deps

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* INTMDB-581: plan fails if API key created by mongodbatlas_api_key resource is deleted outside of Terraform (#1097)

* Add additional delete of state if read does not find API key

* Chore(deps): Bump github.com/aws/aws-sdk-go from 1.40.56 to 1.44.216 (#1094)

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.40.56 to 1.44.216.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.40.56...v1.44.216)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Chore(deps): Bump go.mongodb.org/atlas from 0.21.0 to 0.23.1 (#1092)

Bumps [go.mongodb.org/atlas](https://github.com/mongodb/go-client-mongodb-atlas) from 0.21.0 to 0.23.1.
- [Release notes](https://github.com/mongodb/go-client-mongodb-atlas/releases)
- [Changelog](https://github.com/mongodb/go-client-mongodb-atlas/blob/master/CHANGELOG.md)
- [Commits](mongodb/go-client-mongodb-atlas@v0.21.0...v0.23.1)

---
updated-dependencies:
- dependency-name: go.mongodb.org/atlas
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Chore(deps): Bump golang.org/x/net from 0.1.0 to 0.7.0 (#1071)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.1.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add additional warning if key deleted

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Make comment parameter optional (#1103)

* Change wait states to cover IN_PROGRESS MIGRATING (#1104)

* INTMDB-617: Can't unset auto_scaling (#1112)

* Change wait states to cover IN_PROGRESS MIGRATING

* Add clearing of MinInstanceSize MaxInstanceSize

* INTMDB-638: DataDog ThirdPartyIntegration Documentation update (#1105)

* Updated third party integration documentation for datadog regions

* Consolidated third-party-integration examples and added one for datadog

* Updated documentation link to go to latest api docs

* Quote acceptable regions on third-party-integration for datadog

Co-authored-by: Zuhair Ahmed <[email protected]>

* Update examples/third-party-integration/datadog/README.md

Co-authored-by: Zuhair Ahmed <[email protected]>

---------

Co-authored-by: Zuhair Ahmed <[email protected]>

* INTMDB-648: Errors when creating or importing timeseries online archive (#1114)

* INTMDB-648: Add support for collection_type

* Update resource_mongodbatlas_online_archive.go

* Update website/docs/d/online_archive.html.markdown

Co-authored-by: Zuhair Ahmed <[email protected]>

* Update website/docs/d/online_archives.html.markdown

Co-authored-by: Zuhair Ahmed <[email protected]>

* Update website/docs/r/online_archive.html.markdown

Co-authored-by: Zuhair Ahmed <[email protected]>

---------

Co-authored-by: Zuhair Ahmed <[email protected]>

* Update go.sum

* update mod.go

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dosty Everts <[email protected]>
Co-authored-by: Zuhair Ahmed <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evertsd evertsd evertsd approved these changes

@andreaangiolillo andreaangiolillo andreaangiolillo approved these changes

@Zuhairahmed Zuhairahmed Zuhairahmed 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.
4 participants
@martinstibbe @evertsd @andreaangiolillo @Zuhairahmed