Skip to content

Commit 80d80e7

Browse files
blvaapix-bot[bot]
blva
and
apix-bot[bot]
authored
CLOUDP-33872: add tag check back to cluster upgrade test (#4194)
Co-authored-by: apix-bot[bot] <168195273+apix-bot[bot]@users.noreply.github.com>
1 parent 5d22a8e commit 80d80e7

File tree

30 files changed

+201
-234
lines changed

30 files changed

+201
-234
lines changed

‎test/e2e/atlas/clusters/upgrade/clustersupgrade/clusters_upgrade_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ func TestSharedClusterUpgrade(t *testing.T) {
6565
cluster := fetchCluster(t, cliPath, g.ProjectID, g.ClusterName)
6666
ensureClusterTier(t, cluster, tierM10)
6767
assert.InDelta(t, 40, cluster.GetDiskSizeGB(), 0.01)
68-
// Will be fixed byCLOUDP-338460
69-
// assert.Contains(t, cluster.GetTags(), atlasClustersPinned.ResourceTag{Key: "env", Value: "e2e"})
68+
assert.Contains(t, cluster.GetTags(), atlasClustersPinned.ResourceTag{Key: "env", Value: "e2e"})
7069
})
7170
}
7271

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68b1d90e3e3561754efd5410_clusters_cluster-316_1.snaphost‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68b1d90e3e3561754efd5410_clusters_cluster-316_2.snaphost‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68b1d90e3e3561754efd5410_clusters_cluster-316_3.snaphost‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68bea942c3b8f85430b31de4_clusters_cluster-157_1.snaphost‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
HTTP/2.0 200 OK
2+
Content-Length: 1426
3+
Content-Type: application/vnd.atlas.2023-02-01+json;charset=utf-8
4+
Date: Mon, 08 Sep 2025 10:00:49 GMT
5+
Deprecation: Mon, 5 Aug 2024 00:00:00 GMT
6+
Referrer-Policy: strict-origin-when-cross-origin
7+
Server: mdbws
8+
Strict-Transport-Security: max-age=31536000; includeSubdomains;
9+
Sunset: Sun, 1 Mar 2026 00:00:00 GMT
10+
X-Content-Type-Options: nosniff
11+
X-Envoy-Upstream-Service-Time: 105
12+
X-Frame-Options: DENY
13+
X-Java-Method: ApiAtlasClusterDescriptionV15Resource::getCluster
14+
X-Java-Version: 17.0.15+6
15+
X-Mongodb-Service-Version: gitHash=db10f2975f146ecea1c044f04725bd1389e3bb8b; versionString=master
16+
X-Permitted-Cross-Domain-Policies: none
17+
18+
{"backupEnabled":false,"biConnector":{"enabled":false,"readPreference":"secondary"},"clusterType":"REPLICASET","connectionStrings":{"standardSrv":"mongodb+srv://cluster-157.nh01e2w.mongodb-dev.net"},"createDate":"2025-09-08T10:00:45Z","diskSizeGB":0.5,"diskWarmingMode":"FULLY_WARMED","encryptionAtRestProvider":"NONE","globalClusterSelfManagedSharding":false,"groupId":"68bea942c3b8f85430b31de4","id":"68bea94dd550465b399add91","labels":[],"links":[{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/cluster-157","rel":"self"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/cluster-157/backup/restoreJobs","rel":"https://cloud.mongodb.com/restoreJobs"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/cluster-157/backup/snapshots","rel":"https://cloud.mongodb.com/snapshots"}],"mongoDBMajorVersion":"8.0","mongoDBVersion":"8.0.13","name":"cluster-157","paused":false,"pitEnabled":false,"replicationSpecs":[{"id":"68bea94dd550465b399add85","numShards":1,"regionConfigs":[{"electableSpecs":{"effectiveInstanceSize":"M0","instanceSize":"M0"},"backingProviderName":"AWS","priority":7,"providerName":"TENANT","regionName":"US_EAST_1"}],"zoneId":"68bea94dd550465b399add8c","zoneName":"Zone 1"}],"rootCertType":"ISRGROOTX1","stateName":"CREATING","tags":[],"terminationProtectionEnabled":false,"versionReleaseSystem":"LTS"}

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68bea942c3b8f85430b31de4_clusters_cluster-157_2.snaphost‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
HTTP/2.0 200 OK
2+
Content-Length: 1742
3+
Content-Type: application/vnd.atlas.2024-08-05+json;charset=utf-8
4+
Date: Mon, 08 Sep 2025 10:00:53 GMT
5+
Referrer-Policy: strict-origin-when-cross-origin
6+
Server: mdbws
7+
Strict-Transport-Security: max-age=31536000; includeSubdomains;
8+
X-Content-Type-Options: nosniff
9+
X-Envoy-Upstream-Service-Time: 102
10+
X-Frame-Options: DENY
11+
X-Java-Method: ApiAtlasClusterDescriptionResource20240805::getCluster
12+
X-Java-Version: 17.0.15+6
13+
X-Mongodb-Service-Version: gitHash=db10f2975f146ecea1c044f04725bd1389e3bb8b; versionString=master
14+
X-Permitted-Cross-Domain-Policies: none
15+
16+
{"backupEnabled":false,"biConnector":{"enabled":false,"readPreference":"secondary"},"clusterType":"REPLICASET","connectionStrings":{"standard":"mongodb://ac-atjs0x6-shard-00-00.nh01e2w.mongodb-dev.net:27017,ac-atjs0x6-shard-00-01.nh01e2w.mongodb-dev.net:27017,ac-atjs0x6-shard-00-02.nh01e2w.mongodb-dev.net:27017/?ssl=true&authSource=admin&replicaSet=atlas-cwu3oj-shard-0","standardSrv":"mongodb+srv://cluster-157.nh01e2w.mongodb-dev.net"},"createDate":"2025-09-08T10:00:45Z","diskWarmingMode":"FULLY_WARMED","encryptionAtRestProvider":"NONE","featureCompatibilityVersion":"8.0","globalClusterSelfManagedSharding":false,"groupId":"68bea942c3b8f85430b31de4","id":"68bea94dd550465b399add91","internalClusterRole":"NONE","labels":[],"links":[{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/cluster-157","rel":"self"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/cluster-157/backup/restoreJobs","rel":"https://cloud.mongodb.com/restoreJobs"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/cluster-157/backup/snapshots","rel":"https://cloud.mongodb.com/snapshots"}],"mongoDBMajorVersion":"8.0","mongoDBVersion":"8.0.12","name":"cluster-157","paused":false,"pitEnabled":false,"redactClientLogData":false,"replicationSpecs":[{"id":"68bea94dd550465b399add8d","regionConfigs":[{"electableSpecs":{"effectiveInstanceSize":"M0","instanceSize":"M0","diskSizeGB":0.5},"backingProviderName":"AWS","priority":7,"providerName":"TENANT","regionName":"US_EAST_1"}],"zoneId":"68bea94dd550465b399add8c","zoneName":"Zone 1"}],"rootCertType":"ISRGROOTX1","stateName":"IDLE","tags":[],"terminationProtectionEnabled":false,"versionReleaseSystem":"LTS"}

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68b1d90e3e3561754efd5410_clusters_provider_regions_1.snaphost‎ renamed to ‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_atlas_v2_groups_68bea942c3b8f85430b31de4_clusters_provider_regions_1.snaphost‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
HTTP/2.0 200 OK
22
Content-Length: 367
33
Content-Type: application/vnd.atlas.2023-01-01+json;charset=utf-8
4-
Date: Fri, 29 Aug 2025 16:45:07 GMT
4+
Date: Mon, 08 Sep 2025 10:00:41 GMT
55
Referrer-Policy: strict-origin-when-cross-origin
66
Server: mdbws
77
Strict-Transport-Security: max-age=31536000; includeSubdomains;
88
X-Content-Type-Options: nosniff
9-
X-Envoy-Upstream-Service-Time: 56
9+
X-Envoy-Upstream-Service-Time: 156
1010
X-Frame-Options: DENY
1111
X-Java-Method: ApiAtlasCloudProviderRegionsResource::availableRegions
1212
X-Java-Version: 17.0.15+6
13-
X-Mongodb-Service-Version: gitHash=4ae1a27f7045ec5b8ff2f88678993f8a4ec23755; versionString=master
13+
X-Mongodb-Service-Version: gitHash=db10f2975f146ecea1c044f04725bd1389e3bb8b; versionString=master
1414
X-Permitted-Cross-Domain-Policies: none
1515

16-
{"links":[{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/clusters/provider/regions?includeCount=true&providers=AWS&tier=M0&pageNum=1&itemsPerPage=100","rel":"self"}],"results":[{"instanceSizes":[{"availableRegions":[{"default":false,"name":"US_EAST_2"},{"default":true,"name":"US_EAST_1"}],"name":"M0"}],"provider":"AWS"}],"totalCount":1}
16+
{"links":[{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters/provider/regions?includeCount=true&providers=AWS&tier=M0&pageNum=1&itemsPerPage=100","rel":"self"}],"results":[{"instanceSizes":[{"availableRegions":[{"default":true,"name":"US_EAST_1"},{"default":false,"name":"US_EAST_2"}],"name":"M0"}],"provider":"AWS"}],"totalCount":1}

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/GET_api_private_unauth_nds_defaultMongoDBMajorVersion_1.snaphost‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
HTTP/2.0 200 OK
22
Content-Length: 3
33
Content-Type: text/plain
4-
Date: Fri, 29 Aug 2025 16:45:06 GMT
4+
Date: Mon, 08 Sep 2025 10:00:39 GMT
55
Referrer-Policy: strict-origin-when-cross-origin
66
Server: mdbws
77
Strict-Transport-Security: max-age=31536000; includeSubdomains;
88
Vary: Accept-Encoding
99
X-Content-Type-Options: nosniff
1010
X-Frame-Options: DENY
11-
X-Mongodb-Service-Version: gitHash=4ae1a27f7045ec5b8ff2f88678993f8a4ec23755; versionString=master
11+
X-Mongodb-Service-Version: gitHash=db10f2975f146ecea1c044f04725bd1389e3bb8b; versionString=master
1212
X-Permitted-Cross-Domain-Policies: none
1313
X-Xgen-Up-Proto: HTTP/2
1414

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/POST_api_atlas_v2_groups_1.snaphost‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
HTTP/2.0 201 Created
2-
Content-Length: 1077
2+
Content-Length: 1076
33
Content-Type: application/vnd.atlas.2023-01-01+json;charset=utf-8
4-
Date: Fri, 29 Aug 2025 16:45:02 GMT
4+
Date: Mon, 08 Sep 2025 10:00:34 GMT
55
Location: http://localhost:8080//api/atlas/v1.0
66
Referrer-Policy: strict-origin-when-cross-origin
77
Server: mdbws
88
Strict-Transport-Security: max-age=31536000; includeSubdomains;
99
X-Content-Type-Options: nosniff
10-
X-Envoy-Upstream-Service-Time: 1708
10+
X-Envoy-Upstream-Service-Time: 3242
1111
X-Frame-Options: DENY
1212
X-Java-Method: ApiAtlasGroupsResource::addGroup
1313
X-Java-Version: 17.0.15+6
14-
X-Mongodb-Service-Version: gitHash=4ae1a27f7045ec5b8ff2f88678993f8a4ec23755; versionString=master
14+
X-Mongodb-Service-Version: gitHash=db10f2975f146ecea1c044f04725bd1389e3bb8b; versionString=master
1515
X-Permitted-Cross-Domain-Policies: none
1616

17-
{"clusterCount":0,"created":"2025-08-29T16:45:04Z","id":"68b1d90e3e3561754efd5410","links":[{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410","rel":"self"},{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/containers","rel":"https://cloud.mongodb.com/containers"},{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/clusters","rel":"https://cloud.mongodb.com/clusters"},{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/databaseUsers","rel":"https://cloud.mongodb.com/databaseUsers"},{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/peers","rel":"https://cloud.mongodb.com/peers"},{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/processes","rel":"https://cloud.mongodb.com/processes"},{"href":"http://localhost:8080/api/atlas/v2/groups/68b1d90e3e3561754efd5410/whitelist","rel":"https://cloud.mongodb.com/whitelist"}],"name":"clustersUpgrade-e2e-663","orgId":"a0123456789abcdef012345a","withDefaultAlertsSettings":true}
17+
{"clusterCount":0,"created":"2025-09-08T10:00:37Z","id":"68bea942c3b8f85430b31de4","links":[{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4","rel":"self"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/containers","rel":"https://cloud.mongodb.com/containers"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/clusters","rel":"https://cloud.mongodb.com/clusters"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/databaseUsers","rel":"https://cloud.mongodb.com/databaseUsers"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/peers","rel":"https://cloud.mongodb.com/peers"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/processes","rel":"https://cloud.mongodb.com/processes"},{"href":"http://localhost:8080/api/atlas/v2/groups/68bea942c3b8f85430b31de4/whitelist","rel":"https://cloud.mongodb.com/whitelist"}],"name":"clustersUpgrade-e2e-90","orgId":"a0123456789abcdef012345a","withDefaultAlertsSettings":true}

‎test/e2e/testdata/.snapshots/TestSharedClusterUpgrade/POST_api_atlas_v2_groups_68b1d90e3e3561754efd5410_clusters_1.snaphost‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)