test: Modifies stream_connection and stream_instance tests to use shared cluster and project #2096

AgustinBettati · 2024-03-28T08:32:22Z

Description

Link to any related issue(s): CLOUDP-239134

Modifies stream connection acceptance/migration tests to share a single cluster, no risk in multiple stream connections referencing a same cluster.
Modifies stream connection and stream instance acceptance/migration tests to share a single project, no risk as a each test creates a new stream instance within the project.

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 checked that this change does not generate any credentials and that they are NOT accidentally logged anywhere.
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
If changes include deprecations or removals, I defined an isolated PR with a relevant title as it will be used in the auto-generated changelog.
If changes include removal or addition of 3rd party GitHub actions, I updated our internal document. Reach out to the APIx Integration slack channel to get access to the internal document.

Further comments

… tests

AgustinBettati · 2024-03-28T09:14:36Z

internal/testutil/acc/stream_instance.go

-		resource "mongodbatlas_project" "test" {
-			org_id = %[1]q
-			name   = %[2]q
-		}
-


projects are not longer present as part of the terraform config

AgustinBettati · 2024-03-28T09:15:37Z

internal/service/streamconnection/resource_stream_connection_test.go

-func clusterStreamConnectionConfig(projectIDStr, instanceName, clusterNameStr, clusterTerraformStr string) string {
-	return clusterTerraformStr + fmt.Sprintf(`
-
+func clusterStreamConnectionConfig(projectID, instanceName, clusterName string) string {
+	return fmt.Sprintf(`


cluster definition is no longer part of the terraform config

internal/service/streaminstance/data_source_stream_instances_test.go

marcosuma · 2024-03-28T13:16:27Z

internal/service/streaminstance/data_source_stream_instances_test.go

-				Config: streamInstancesDataSourceConfig(orgID, projectName, instanceName, region, cloudProvider),
-				Check:  streamInstancesAttributeChecks(dataSourceName, nil, nil, 1),
+				Config: streamInstancesDataSourceConfig(projectID, instanceName, region, cloudProvider),
+				Check:  streamInstancesAttributeChecks(dataSourceName, nil, nil, acc.IntGreatThan(0)), // at least on instance is present in the project


can we change this and check something that uniquely identifies the instance?

good idea, apart from checking result is larger than 0 added a TestCheckTypeSetElemNestedAttrs to verify it contains an element with the stream instance name that was created in the test.

marcosuma · 2024-03-28T13:17:07Z

internal/service/streaminstance/data_source_stream_instances_test.go

@@ -44,40 +41,40 @@ func TestAccStreamDSStreamInstances_withPageConfig(t *testing.T) {
 		CheckDestroy:             acc.CheckDestroyStreamInstance,
 		Steps: []resource.TestStep{
 			{
-				Config: streamInstancesWithPageAttrDataSourceConfig(orgID, projectName, instanceName, region, cloudProvider),
-				Check:  streamInstancesAttributeChecks(dataSourceName, admin.PtrInt(2), admin.PtrInt(1), 0),
+				Config: streamInstancesWithPageAttrDataSourceConfig(projectID, instanceName, region, cloudProvider, 1000),


could we give that 1000 a variable name?

yes, extracted

marcosuma · 2024-03-28T13:21:26Z

internal/service/streaminstance/data_source_stream_instances_test.go

-				Config: streamInstancesWithPageAttrDataSourceConfig(orgID, projectName, instanceName, region, cloudProvider),
-				Check:  streamInstancesAttributeChecks(dataSourceName, admin.PtrInt(2), admin.PtrInt(1), 0),
+				Config: streamInstancesWithPageAttrDataSourceConfig(projectID, instanceName, region, cloudProvider, 1000),
+				Check:  streamInstancesAttributeChecks(dataSourceName, admin.PtrInt(1000), admin.PtrInt(1), acc.IntLowerThan(1)), // expecting no results


why not leaving 0?

mess up from my end, leaving the check with 0 is just fine.

EspenAlbert

LGTM. Probably out of scope to refactor the datasource tests to be part of the resource tests?

AgustinBettati · 2024-04-02T08:19:33Z

Probably out of scope to refactor the datasource tests to be part of the resource tests?

will followup with a new PR for this change 👍

AgustinBettati added 2 commits March 28, 2024 08:52

test: Used shared cluster for execution of stream connections tests

12d5e12

test: Uses shared project for stream connection and instance resource…

bffd0ba

… tests

AgustinBettati commented Mar 28, 2024

View reviewed changes

AgustinBettati changed the title ~~test: Used shared cluster for execution of stream connections tests~~ test: Used shared cluster and project for execution of stream_connection and stream_instance tests Mar 28, 2024

AgustinBettati commented Mar 28, 2024

View reviewed changes

internal/service/streaminstance/data_source_stream_instances_test.go Outdated Show resolved Hide resolved

AgustinBettati marked this pull request as ready for review March 28, 2024 10:29

AgustinBettati requested a review from a team as a code owner March 28, 2024 10:29

marcosuma reviewed Mar 28, 2024

View reviewed changes

avoid plural data source checks fixed to specific values

b59a73c

AgustinBettati force-pushed the CLOUDP-239134-stream-connection branch from 9b77917 to b59a73c Compare March 28, 2024 14:24

AgustinBettati changed the title ~~test: Used shared cluster and project for execution of stream_connection and stream_instance tests~~ test: Modifies stream_connection and stream_instance tests to use shared cluster and project Mar 28, 2024

lantoli approved these changes Apr 1, 2024

View reviewed changes

EspenAlbert approved these changes Apr 1, 2024

View reviewed changes

AgustinBettati merged commit 7453c79 into master Apr 2, 2024
48 checks passed

AgustinBettati deleted the CLOUDP-239134-stream-connection branch April 2, 2024 08:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: Modifies stream_connection and stream_instance tests to use shared cluster and project #2096

test: Modifies stream_connection and stream_instance tests to use shared cluster and project #2096

AgustinBettati commented Mar 28, 2024 •

edited

Loading

AgustinBettati Mar 28, 2024

AgustinBettati Mar 28, 2024

marcosuma Mar 28, 2024

AgustinBettati Mar 28, 2024 •

edited

Loading

marcosuma Mar 28, 2024

AgustinBettati Mar 28, 2024

marcosuma Mar 28, 2024

AgustinBettati Mar 28, 2024

EspenAlbert left a comment

AgustinBettati commented Apr 2, 2024 •

edited

Loading

test: Modifies stream_connection and stream_instance tests to use shared cluster and project #2096

test: Modifies stream_connection and stream_instance tests to use shared cluster and project #2096

Conversation

AgustinBettati commented Mar 28, 2024 • edited Loading

Description

Type of change:

Required Checklist:

Further comments

AgustinBettati Mar 28, 2024

Choose a reason for hiding this comment

AgustinBettati Mar 28, 2024

Choose a reason for hiding this comment

marcosuma Mar 28, 2024

Choose a reason for hiding this comment

AgustinBettati Mar 28, 2024 • edited Loading

Choose a reason for hiding this comment

marcosuma Mar 28, 2024

Choose a reason for hiding this comment

AgustinBettati Mar 28, 2024

Choose a reason for hiding this comment

marcosuma Mar 28, 2024

Choose a reason for hiding this comment

AgustinBettati Mar 28, 2024

Choose a reason for hiding this comment

EspenAlbert left a comment

Choose a reason for hiding this comment

AgustinBettati commented Apr 2, 2024 • edited Loading

AgustinBettati commented Mar 28, 2024 •

edited

Loading

AgustinBettati Mar 28, 2024 •

edited

Loading

AgustinBettati commented Apr 2, 2024 •

edited

Loading