CLOUDP-167925: add support for PrivateEndpoint.srvShardOptimizedConnectionString (#423)

ciprian-tibulca · web-flow · commit d36f1bf2bcf6 · 2023-03-23T12:14:39.000Z
diff --git a/mongodbatlas/clusters.go b/mongodbatlas/clusters.go
@@ -113,10 +113,11 @@ type ReplicationSpec struct {
 // Atlas returns this parameter only if you deployed a private endpoint to all regions
 // to which you deployed this cluster's nodes.
 type PrivateEndpoint struct {
-	ConnectionString    string     `json:"connectionString,omitempty"`
-	Endpoints           []Endpoint `json:"endpoints,omitempty"`
-	SRVConnectionString string     `json:"srvConnectionString,omitempty"`
-	Type                string     `json:"type,omitempty"`
+	ConnectionString                  string     `json:"connectionString,omitempty"`
+	Endpoints                         []Endpoint `json:"endpoints,omitempty"`
+	SRVConnectionString               string     `json:"srvConnectionString,omitempty"`
+	SRVShardOptimizedConnectionString string     `json:"srvShardOptimizedConnectionString,omitempty"`
+	Type                              string     `json:"type,omitempty"`
 }
 
 // Endpoint through which you connect to Atlas.
diff --git a/mongodbatlas/clusters_test.go b/mongodbatlas/clusters_test.go
@@ -67,6 +67,7 @@ func TestClusters_ListClusters(t *testing.T) {
 						   }
 						  ],
 						  "srvConnectionString": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
+						  "srvShardOptimizedConnectionString": "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",
 						  "type": "MONGOD"
 						 }
 						]
@@ -142,6 +143,7 @@ func TestClusters_ListClusters(t *testing.T) {
 						   }
 						  ],
 						  "srvConnectionString": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
+						  "srvShardOptimizedConnectionString": "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",
 						  "type": "MONGOD"
 						 }
 						]
@@ -211,9 +213,10 @@ func TestClusters_ListClusters(t *testing.T) {
 			PrivateSrv:        "mongodb+srv://cluster0-pri.auylw.mongodb.net",
 			PrivateEndpoint: []PrivateEndpoint{
 				{
-					ConnectionString:    "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",
-					SRVConnectionString: "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
-					Type:                "MONGOD",
+					ConnectionString:                  "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",
+					SRVConnectionString:               "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
+					SRVShardOptimizedConnectionString: "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",
+					Type:                              "MONGOD",
 					Endpoints: []Endpoint{
 						{
 							EndpointID:   "vpce-0d00c26273372c6ef",
@@ -886,6 +889,7 @@ func TestClusters_Get(t *testing.T) {
 				   }
 				  ],
 				  "srvConnectionString": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
+				  "srvShardOptimizedConnectionString": "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",
 				  "type": "MONGOD"
 				 }
 				]
@@ -943,9 +947,10 @@ func TestClusters_Get(t *testing.T) {
 			PrivateSrv:        "mongodb+srv://cluster0-pri.auylw.mongodb.net",
 			PrivateEndpoint: []PrivateEndpoint{
 				{
-					ConnectionString:    "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",
-					SRVConnectionString: "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
-					Type:                "MONGOD",
+					ConnectionString:                  "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",
+					SRVConnectionString:               "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",
+					SRVShardOptimizedConnectionString: "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",
+					Type:                              "MONGOD",
 					Endpoints: []Endpoint{
 						{
 							EndpointID:   "vpce-0d00c26273372c6ef",

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ func TestClusters_ListClusters(t *testing.T) {`
`67`	`67`	`}`
`68`	`68`	`],`
`69`	`69`	`"srvConnectionString": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
	`70`	`+ "srvShardOptimizedConnectionString": "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",`
`70`	`71`	`"type": "MONGOD"`
`71`	`72`	`}`
`72`	`73`	`]`
`@@ -142,6 +143,7 @@ func TestClusters_ListClusters(t *testing.T) {`
`142`	`143`	`}`
`143`	`144`	`],`
`144`	`145`	`"srvConnectionString": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
	`146`	`+ "srvShardOptimizedConnectionString": "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",`
`145`	`147`	`"type": "MONGOD"`
`146`	`148`	`}`
`147`	`149`	`]`
`@@ -211,9 +213,10 @@ func TestClusters_ListClusters(t *testing.T) {`
`211`	`213`	`PrivateSrv: "mongodb+srv://cluster0-pri.auylw.mongodb.net",`
`212`	`214`	`PrivateEndpoint: []PrivateEndpoint{`
`213`	`215`	`{`
`214`		`- ConnectionString: "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",`
`215`		`- SRVConnectionString: "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
`216`		`- Type: "MONGOD",`
	`216`	`+ ConnectionString: "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",`
	`217`	`+ SRVConnectionString: "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
	`218`	`+ SRVShardOptimizedConnectionString: "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",`
	`219`	`+ Type: "MONGOD",`
`217`	`220`	`Endpoints: []Endpoint{`
`218`	`221`	`{`
`219`	`222`	`EndpointID: "vpce-0d00c26273372c6ef",`
`@@ -886,6 +889,7 @@ func TestClusters_Get(t *testing.T) {`
`886`	`889`	`}`
`887`	`890`	`],`
`888`	`891`	`"srvConnectionString": "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
	`892`	`+ "srvShardOptimizedConnectionString": "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",`
`889`	`893`	`"type": "MONGOD"`
`890`	`894`	`}`
`891`	`895`	`]`
`@@ -943,9 +947,10 @@ func TestClusters_Get(t *testing.T) {`
`943`	`947`	`PrivateSrv: "mongodb+srv://cluster0-pri.auylw.mongodb.net",`
`944`	`948`	`PrivateEndpoint: []PrivateEndpoint{`
`945`	`949`	`{`
`946`		`- ConnectionString: "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",`
`947`		`- SRVConnectionString: "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
`948`		`- Type: "MONGOD",`
	`950`	`+ ConnectionString: "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",`
	`951`	`+ SRVConnectionString: "mongodb+srv://cluster0-pl-0-auylw.mongodb.net",`
	`952`	`+ SRVShardOptimizedConnectionString: "mongodb+srv://cluster0-pl-0-auylw-lb.mongodb.net",`
	`953`	`+ Type: "MONGOD",`
`949`	`954`	`Endpoints: []Endpoint{`
`950`	`955`	`{`
`951`	`956`	`EndpointID: "vpce-0d00c26273372c6ef",`