Skip to content

Commit b958465

Browse files
martinstibbeevertsdZuhairahmeddependabot[bot]
authored
Release staging v1.6.1 (#947)
* INTMDB-438 ForceNew on cluster name change (#902) * Added ForceNew for name on Cluster * Updated documentation to include information on name changes for cluster * INTMDB-481: Add support for identity provider display name import (#924) * Add support for identity provider display name import * Update example for mongodbatlas_federated_settings_org_config * Update documentation for mongodbatlas_federated_settings_org_configs * Remove confusing verbiage * INTMDB-498: Updated Prometheus Example (#942) * Serverless Endpoint Service Doc Bug (#930) * Update CHANGELOG.md * Chore(deps): Bump github.com/gruntwork-io/terratest (#936) Bumps [github.com/gruntwork-io/terratest](https://github.com/gruntwork-io/terratest) from 0.41.0 to 0.41.3. - [Release notes](https://github.com/gruntwork-io/terratest/releases) - [Commits](gruntwork-io/terratest@v0.41.0...v0.41.3) --- updated-dependencies: - dependency-name: github.com/gruntwork-io/terratest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add additional context for prometheus example * Update Readme.md Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Zuhair Ahmed <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * INTMDB-484: Skip tests for OPS GENIE and GOV (#937) * Serverless Endpoint Service Doc Bug (#930) * Update CHANGELOG.md * Skip broken OPS_GENIE token and GOV tests in main ACC test run * make fmt * Remove comment Co-authored-by: Zuhair Ahmed <[email protected]> * INTMDB-438 ForceNew on cluster name change (#929) * Added ForceNew for name on Cluster * Updated documentation to include information on name changes for cluster * INTMDB-434 - Fixed private_endpoint output documentation (#907) * Fixed documentation to include more accurate information on how to output a private_endpoint by endpoint_id * Updated cluster docs to have a generic example for getting connection_string from endpoint_service_id, and links to full examples for AWS, AZURE, and GCP * Updated examples to have a reference to a cluster, optionally, in order to extract the connection strings * Updated readme to contain information on the optional cluster_name variable * Removed moved documentation and added example output in comment * formatting * formatting -GCP * Typo fix * typo fix - azure * Apply suggestions from code review Copy updates on example readme Co-authored-by: Zuhair Ahmed <[email protected]> * Updated advanced_cluster documentation to have information on getting connection string Co-authored-by: Zuhair Ahmed <[email protected]> * INTMDB-493: Serverless Private Endpoint Connection String Example Fix (#940) * Serverless Endpoint Service Doc Bug (#930) * Update CHANGELOG.md * Change connection_strings_private_srv to a list of connections * Update connection_strings_private_srv to connection_strings_private_endpoint_srv Co-authored-by: Zuhair Ahmed <[email protected]> * INTMDB-426: Alert Configuration -- Api Token erroneous changes (#941) * Serverless Endpoint Service Doc Bug (#930) * Update CHANGELOG.md * Ignore API keys after apply Co-authored-by: Zuhair Ahmed <[email protected]> * INTMDB-368: Shorten test names that are too long to allow for targeting specific tests (#932) * Serverless Endpoint Service Doc Bug (#930) * Update CHANGELOG.md * Split tests in segments to permit retry failed test areas in less time * Change Regex * skip TestAccConfigRSThirdPartyIntegration_basic * skip TestAccNetworkRSPrivateEndpointRegionalMode_basic * Skip Gov tests during regular test run * Skip OPS_GENIE test * Change skip test method * Split out cluster RS and DS * Single thread private link ADL tests that conflict during parallel execution * Split out Clusters * Lower max number of tests to run at once * Lower concurrent jobs due to cluster limits * Chain job deps to enforce order * Combine Clusters back into one workflow * Skip TestAccClusterRSAdvancedCluster_Paused * go fmt Co-authored-by: Zuhair Ahmed <[email protected]> * INTMDB-463 Cluster container_id documentation (#931) * container_id documentation updated to reflect that it's a computed field * Updated documentation around network_peering * Moved container_id to attribute reference * Fixed documentation reference * INTMDB-478: Auto-Generate Changelog (#944) * Serverless Endpoint Service Doc Bug (#930) * Update CHANGELOG.md * Chore(deps): Bump github.com/gruntwork-io/terratest (#936) Bumps [github.com/gruntwork-io/terratest](https://github.com/gruntwork-io/terratest) from 0.41.0 to 0.41.3. - [Release notes](https://github.com/gruntwork-io/terratest/releases) - [Commits](gruntwork-io/terratest@v0.41.0...v0.41.3) --- updated-dependencies: - dependency-name: github.com/gruntwork-io/terratest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Create .github_changelog_generator Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Zuhair Ahmed <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * INTMDB-465 - PrivateLink Endpoint Service & Connection Strings (#943) * INTMDB-384 Fix PrivateLink test flakiness (#895) * Using different endpointID values for the endpoint service adl tests * Removed parallelization with private link endpoint test which had overlap with others * Reverted changes to the endpointID * Waiting for Clusters to be idle on pes create * Formatted and added Deleted as a target status * Removed unintended changes * Updated Delete to use TimeoutDelete * Utilizing error when ClusterListAdvancedRefreshFunc fails * Updated RefreshFunc to just return PENDING if cluster is not IDLE * Updated StateChanegConf for endpoints vs. cluster status * Fixed Pending/Target status' for PrivateEndpointServiceLinkDelete * Added INITIATING back to list of Pending statuses on delete * Added serverless instance list refresh func & utlizing it on serverless endpoint service * Removed unintentional changes to tests and using a proper error message string * Fixed error message wording to reference proper resource * Removed extra quote on serverless instance * WaitForStateContext inline with conditional * Added documentation on completion condition for endponit service creation & deletion * INTMDB-470: Private Endpoint Regional Mode test fixes (#946) * Added a separate test for the basics of perm that does not require aws access * Skipping complex test * Renamed tests to fit more w/refac * Updated RefreshFunc to just return PENDING if cluster is not IDLE * Updated StateChanegConf for endpoints vs. cluster status * Fixed Pending/Target status' for PrivateEndpointServiceLinkDelete * Added INITIATING back to list of Pending statuses on delete * Putting WaitForStateContext inline with condition checking if it err Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Dosty Everts <[email protected]> Co-authored-by: Zuhair Ahmed <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 3f166a7 commit b958465

File tree

148 files changed

+1112
-439
lines changed

Some content is hidden

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

148 files changed

+1112
-439
lines changed

.github/workflows/automated-test-acceptances.yml

Lines changed: 374 additions & 1 deletion
Large diffs are not rendered by default.

.github_changelog_generator

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
future-release=v1.6.1
2+
since-tag=v1.6.0
3+
date-format=%B %d, %Y
4+
base=CHANGELOG.md

GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ test: fmtcheck
3737
.PHONY: testacc
3838
testacc: fmtcheck
3939
@$(eval VERSION=acc)
40-
TF_ACC=1 go test $(TEST) -v -parallel 20 $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -cover -ldflags="$(LINKER_FLAGS)"
40+
TF_ACC=1 go test $(TEST) -run '$(TEST_REGEX)' -v -parallel 5 $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -cover -ldflags="$(LINKER_FLAGS)"
4141

4242
.PHONY: testaccgov
4343
testaccgov: fmtcheck
4444
@$(eval VERSION=acc)
45-
TF_ACC=1 go test $(TEST) -run 'TestAccResourceMongoDBAtlasGovProject_CreateWithProjectOwner' -v -parallel 1 "$(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -cover -ldflags=$(LINKER_FLAGS) "
45+
TF_ACC=1 go test $(TEST) -run 'TestAccProjectRSGovProject_CreateWithProjectOwner' -v -parallel 1 "$(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -cover -ldflags=$(LINKER_FLAGS) "
4646

4747
.PHONY: fmt
4848
fmt:

examples/Federated-Settings/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ resource "mongodbatlas_federated_settings_org_config" "org_connections_import" {
3535
identity_provider_id = var.identity_provider_id
3636
domain_restriction_enabled = false
3737
domain_allow_list = ["yourdomain.com"]
38+
post_auth_role_grants = ["ORG_MEMBER"]
3839
}
3940

4041
resource "mongodbatlas_federated_settings_identity_provider" "identity_provider" {

examples/MongoDB-Atlas-Third-Party-Integration/Readme.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ This project currently creates the below deployments:
5252

5353
**3\. Execute the Terraform apply.**
5454

55-
Now execute the plan to provision the MongoDB Atlas resources.
55+
Now execute the plan to provision the MongoDB Atlas resources.
56+
Note: you can find the Prometheus Config details under Outputs section.
5657

5758
``` bash
5859
$ terraform apply
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
output "prometheus_config" {
2+
value = data.template_file.init.rendered
3+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
global:
2+
scrape_interval: 15s
3+
scrape_configs:
4+
5+
- job_name: "${job_name}"
6+
scrape_interval: 10s
7+
metrics_path: /metrics
8+
scheme : https
9+
basic_auth:
10+
username: prom_user_${group_id}
11+
password: ${password}
12+
http_sd_configs:
13+
- url: https://cloud.mongodb.com/prometheus/v1.0/groups/${group_id}/discovery
14+
refresh_interval: 60s
15+
basic_auth:
16+
username: prom_user_${group_id}
17+
password: ${password}
18+

examples/MongoDB-Atlas-Third-Party-Integration/third-party-integration.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,13 @@ resource "mongodbatlas_third_party_integration" "test_prometheus" {
1313
scheme = "https"
1414
enabled = true
1515
}
16+
17+
data "template_file" "init" {
18+
template = file("prom-conf-yml.tpl")
19+
20+
vars = {
21+
job_name = "test-job"
22+
group_id = mongodbatlas_project.project.id
23+
password = mongodbatlas_third_party_integration.test_prometheus.password
24+
}
25+
}

examples/MongoDB-Atlas-Third-Party-Integration/versions.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
terraform {
22
required_providers {
33
mongodbatlas = {
4-
source = "mongodb/mongodbatlas"
4+
source = "mongodb/mongodbatlas"
5+
version = "1.6.0"
56
}
67
}
78
required_version = ">= 0.13"

examples/aws-atlas-privatelink-regionalized/atlas-pl.tf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,23 @@ resource "mongodbatlas_privatelink_endpoint_service" "atlaseplink_east" {
4545
private_link_id = mongodbatlas_privatelink_endpoint.atlaspl_east.id
4646
provider_name = "AWS"
4747
}
48+
49+
locals {
50+
private_endpoints = flatten([for cs in mongodbatlas_cluster.cluster-atlas.connection_strings : cs.private_endpoint])
51+
connection_strings_west = [
52+
for pe in local.private_endpoints : pe.srv_connection_string
53+
if contains([for e in pe.endpoints : e.endpoint_id], aws_vpc_endpoint.ptfe_service_west.id)
54+
]
55+
connection_strings_east = [
56+
for pe in local.private_endpoints : pe.srv_connection_string
57+
if contains([for e in pe.endpoints : e.endpoint_id], aws_vpc_endpoint.ptfe_service_east.id)
58+
]
59+
}
60+
61+
output "connection_string_east" {
62+
value = length(local.connection_strings_east) > 0 ? local.connection_strings_east[0] : ""
63+
}
64+
65+
output "connection_string_west" {
66+
value = length(local.connection_strings_west) > 0 ? local.connection_strings_west[0] : ""
67+
}

0 commit comments

Comments
 (0)