From 0cc99c5e1030e16db3d20a4b7accf14c838719e4 Mon Sep 17 00:00:00 2001 From: edgar lopez Date: Mon, 6 Apr 2020 11:44:06 -0500 Subject: [PATCH 1/3] feat: added fields private and privateSrv for connection strings --- mongodbatlas/clusters.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mongodbatlas/clusters.go b/mongodbatlas/clusters.go index eb9683cc0..c56e1dc2c 100644 --- a/mongodbatlas/clusters.go +++ b/mongodbatlas/clusters.go @@ -75,6 +75,8 @@ type ConnectionStrings struct { StandardSrv string `json:"standardSrv,omitempty"` AwsPrivateLink map[string]string `json:"awsPrivateLink,omitempty"` AwsPrivateLinkSrv map[string]string `json:"awsPrivateLinkSrv,omitempty"` + Private string `json:"private,omitempty"` + PrivateSrv string `json:"privateSrv,omitempty"` } // Cluster represents MongoDB cluster. From a76d9aa95285ab6ea0b4c254dcaee9cbe3900760 Mon Sep 17 00:00:00 2001 From: edgar lopez Date: Mon, 6 Apr 2020 11:45:41 -0500 Subject: [PATCH 2/3] test: added fields private and privateSrv for connection strings in test --- mongodbatlas/clusters_test.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mongodbatlas/clusters_test.go b/mongodbatlas/clusters_test.go index 0559390c6..7f20e898d 100644 --- a/mongodbatlas/clusters_test.go +++ b/mongodbatlas/clusters_test.go @@ -36,7 +36,9 @@ func TestClusters_ListClusters(t *testing.T) { }, "awsPrivateLinkSrv": { "vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net" - } + }, + "private": "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + "privateSrv": "mongodb+srv://cluster0-auylw.mongodb.net" }, "diskSizeGB": 160, "encryptionAtRestProvider": "AWS", @@ -84,7 +86,9 @@ func TestClusters_ListClusters(t *testing.T) { }, "awsPrivateLinkSrv": { "vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net" - } + }, + "private": "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + "privateSrv": "mongodb+srv://cluster0-auylw.mongodb.net" }, "diskSizeGB": 160, "encryptionAtRestProvider": "AWS", @@ -134,6 +138,8 @@ func TestClusters_ListClusters(t *testing.T) { StandardSrv: "mongodb+srv://cluster0-auylw.mongodb.net", AwsPrivateLink: map[string]string{"vpce-0d00c26273372c6ef": "mongodb://pl-0-us-east-1-auylw.mongodb.net:1024,pl-0-us-east-1-auylw.mongodb.net:1025,pl-0-us-east-1-auylw.mongodb.net:1026/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0-shard-0"}, AwsPrivateLinkSrv: map[string]string{"vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net"}, + Private: "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + PrivateSrv: "mongodb+srv://cluster0-auylw.mongodb.net", }, DiskSizeGB: pointy.Float64(160), EncryptionAtRestProvider: "AWS", @@ -724,7 +730,9 @@ func TestClusters_Get(t *testing.T) { }, "awsPrivateLinkSrv": { "vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net" - } + }, + "private": "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + "privateSrv": "mongodb+srv://cluster0-auylw.mongodb.net" }, "diskSizeGB": 160, "encryptionAtRestProvider": "AWS", @@ -773,6 +781,8 @@ func TestClusters_Get(t *testing.T) { StandardSrv: "mongodb+srv://cluster0-auylw.mongodb.net", AwsPrivateLink: map[string]string{"vpce-0d00c26273372c6ef": "mongodb://pl-0-us-east-1-auylw.mongodb.net:1024,pl-0-us-east-1-auylw.mongodb.net:1025,pl-0-us-east-1-auylw.mongodb.net:1026/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0-shard-0"}, AwsPrivateLinkSrv: map[string]string{"vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net"}, + Private: "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + PrivateSrv: "mongodb+srv://cluster0-auylw.mongodb.net", }, DiskSizeGB: pointy.Float64(160), EncryptionAtRestProvider: "AWS", From c06d52a5166d653fd69101e7fa2b36e82cf8d38a Mon Sep 17 00:00:00 2001 From: edgar lopez Date: Mon, 6 Apr 2020 12:47:05 -0500 Subject: [PATCH 3/3] test: changed the url for private and privateSrv of connection strings --- mongodbatlas/clusters_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mongodbatlas/clusters_test.go b/mongodbatlas/clusters_test.go index 7f20e898d..0ed5b6c60 100644 --- a/mongodbatlas/clusters_test.go +++ b/mongodbatlas/clusters_test.go @@ -37,8 +37,8 @@ func TestClusters_ListClusters(t *testing.T) { "awsPrivateLinkSrv": { "vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net" }, - "private": "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", - "privateSrv": "mongodb+srv://cluster0-auylw.mongodb.net" + "private": "mongodb://cluster0-shard-00-00-pri.auylw.mongodb.net:27017,cluster0-shard-00-01-pri.auylw.mongodb.net:27017,cluster0-shard-00-02-pri.auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + "privateSrv": "mongodb+srv://cluster0-pri.auylw.mongodb.net" }, "diskSizeGB": 160, "encryptionAtRestProvider": "AWS", @@ -87,8 +87,8 @@ func TestClusters_ListClusters(t *testing.T) { "awsPrivateLinkSrv": { "vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net" }, - "private": "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", - "privateSrv": "mongodb+srv://cluster0-auylw.mongodb.net" + "private": "mongodb://cluster0-shard-00-00-pri.auylw.mongodb.net:27017,cluster0-shard-00-01-pri.auylw.mongodb.net:27017,cluster0-shard-00-02-pri.auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + "privateSrv": "mongodb+srv://cluster0-pri.auylw.mongodb.net" }, "diskSizeGB": 160, "encryptionAtRestProvider": "AWS", @@ -138,8 +138,8 @@ func TestClusters_ListClusters(t *testing.T) { StandardSrv: "mongodb+srv://cluster0-auylw.mongodb.net", AwsPrivateLink: map[string]string{"vpce-0d00c26273372c6ef": "mongodb://pl-0-us-east-1-auylw.mongodb.net:1024,pl-0-us-east-1-auylw.mongodb.net:1025,pl-0-us-east-1-auylw.mongodb.net:1026/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0-shard-0"}, AwsPrivateLinkSrv: map[string]string{"vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net"}, - Private: "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", - PrivateSrv: "mongodb+srv://cluster0-auylw.mongodb.net", + Private: "mongodb://cluster0-shard-00-00-pri.auylw.mongodb.net:27017,cluster0-shard-00-01-pri.auylw.mongodb.net:27017,cluster0-shard-00-02-pri.auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + PrivateSrv: "mongodb+srv://cluster0-pri.auylw.mongodb.net", }, DiskSizeGB: pointy.Float64(160), EncryptionAtRestProvider: "AWS", @@ -731,8 +731,8 @@ func TestClusters_Get(t *testing.T) { "awsPrivateLinkSrv": { "vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net" }, - "private": "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", - "privateSrv": "mongodb+srv://cluster0-auylw.mongodb.net" + "private": "mongodb://cluster0-shard-00-00-pri.auylw.mongodb.net:27017,cluster0-shard-00-01-pri.auylw.mongodb.net:27017,cluster0-shard-00-02-pri.auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + "privateSrv": "mongodb+srv://cluster0-pri.auylw.mongodb.net" }, "diskSizeGB": 160, "encryptionAtRestProvider": "AWS", @@ -781,8 +781,8 @@ func TestClusters_Get(t *testing.T) { StandardSrv: "mongodb+srv://cluster0-auylw.mongodb.net", AwsPrivateLink: map[string]string{"vpce-0d00c26273372c6ef": "mongodb://pl-0-us-east-1-auylw.mongodb.net:1024,pl-0-us-east-1-auylw.mongodb.net:1025,pl-0-us-east-1-auylw.mongodb.net:1026/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0-shard-0"}, AwsPrivateLinkSrv: map[string]string{"vpce-0d00c26273372c6ef": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net"}, - Private: "mongodb://cluster0-shard-00-00-auylw.mongodb.net:27017,cluster0-shard-00-01-auylw.mongodb.net:27017,cluster0-shard-00-02-auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", - PrivateSrv: "mongodb+srv://cluster0-auylw.mongodb.net", + Private: "mongodb://cluster0-shard-00-00-pri.auylw.mongodb.net:27017,cluster0-shard-00-01-pri.auylw.mongodb.net:27017,cluster0-shard-00-02-pri.auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0", + PrivateSrv: "mongodb+srv://cluster0-pri.auylw.mongodb.net", }, DiskSizeGB: pointy.Float64(160), EncryptionAtRestProvider: "AWS",