Add ossRDBMSResourceId to Environment configuration. (#635)

rbranche · web-flow · commit 41c23d27dd33 · 2021-06-01T11:25:02.000-07:00
diff --git a/autorest/azure/environments.go b/autorest/azure/environments.go
@@ -45,6 +45,7 @@ type ResourceIdentifier struct {
 	Datalake            string `json:"datalake"`
 	Batch               string `json:"batch"`
 	OperationalInsights string `json:"operationalInsights"`
+	OSSRDBMS            string `json:"ossRDBMS"`
 	Storage             string `json:"storage"`
 	Synapse             string `json:"synapse"`
 	ServiceBus          string `json:"serviceBus"`
@@ -116,6 +117,7 @@ var (
 			Datalake:            "https://datalake.azure.net/",
 			Batch:               "https://batch.core.windows.net/",
 			OperationalInsights: "https://api.loganalytics.io",
+			OSSRDBMS:            "https://ossrdbms-aad.database.windows.net",
 			Storage:             "https://storage.azure.com/",
 			Synapse:             "https://dev.azuresynapse.net",
 			ServiceBus:          "https://servicebus.azure.net/",
@@ -156,6 +158,7 @@ var (
 			Datalake:            NotAvailable,
 			Batch:               "https://batch.core.usgovcloudapi.net/",
 			OperationalInsights: "https://api.loganalytics.us",
+			OSSRDBMS:            "https://ossrdbms-aad.database.usgovcloudapi.net",
 			Storage:             "https://storage.azure.com/",
 			Synapse:             NotAvailable,
 			ServiceBus:          "https://servicebus.azure.net/",
@@ -196,6 +199,7 @@ var (
 			Datalake:            NotAvailable,
 			Batch:               "https://batch.chinacloudapi.cn/",
 			OperationalInsights: NotAvailable,
+			OSSRDBMS:            "https://ossrdbms-aad.database.chinacloudapi.cn",
 			Storage:             "https://storage.azure.com/",
 			Synapse:             "https://dev.azuresynapse.net",
 			ServiceBus:          "https://servicebus.azure.net/",
@@ -236,6 +240,7 @@ var (
 			Datalake:            NotAvailable,
 			Batch:               "https://batch.cloudapi.de/",
 			OperationalInsights: NotAvailable,
+			OSSRDBMS:            "https://ossrdbms-aad.database.cloudapi.de",
 			Storage:             "https://storage.azure.com/",
 			Synapse:             NotAvailable,
 			ServiceBus:          "https://servicebus.azure.net/",
diff --git a/autorest/azure/environments_test.go b/autorest/azure/environments_test.go
@@ -33,6 +33,7 @@ const (
 	graphResourceID      = "--graph-resource-id--"
 	keyvaultResourceID   = "--keyvault-resource-id--"
 	opInsightsResourceID = "--operational-insights-resource-id--"
+	ossRDBMSResourceID   = "--oss-rdbms-resource-id--"
 )
 
 // This correlates to the expected contents of ./testdata/test_environment_1.json
@@ -65,6 +66,7 @@ var testEnvironment1 = Environment{
 		Graph:               graphResourceID,
 		KeyVault:            keyvaultResourceID,
 		OperationalInsights: opInsightsResourceID,
+		OSSRDBMS:            ossRDBMSResourceID,
 	},
 }
 
@@ -225,7 +227,8 @@ func TestDeserializeEnvironment(t *testing.T) {
 			"datalake": "` + datalakeResourceID + `",
 			"graph": "` + graphResourceID + `",
 			"keyVault": "` + keyvaultResourceID + `",
-			"operationalInsights": "` + opInsightsResourceID + `"
+			"operationalInsights": "` + opInsightsResourceID + `",
+			"ossRDBMS": "` + ossRDBMSResourceID + `"
 		}
 	}`
 
@@ -313,6 +316,9 @@ func TestDeserializeEnvironment(t *testing.T) {
 	if opInsightsResourceID != testSubject.ResourceIdentifiers.OperationalInsights {
 		t.Errorf("Expected ResourceIdentifiers.OperationalInsights to be "+opInsightsResourceID+", but got %q", testSubject.ResourceIdentifiers.OperationalInsights)
 	}
+	if ossRDBMSResourceID != testSubject.ResourceIdentifiers.OSSRDBMS {
+		t.Errorf("Expected ResourceIdentifiers.OperationalInsights to be "+ossRDBMSResourceID+", but got %q", testSubject.ResourceIdentifiers.OSSRDBMS)
+	}
 }
 
 func TestRoundTripSerialization(t *testing.T) {
@@ -345,6 +351,7 @@ func TestRoundTripSerialization(t *testing.T) {
 			Graph:               graphResourceID,
 			KeyVault:            keyvaultResourceID,
 			OperationalInsights: opInsightsResourceID,
+			OSSRDBMS:            ossRDBMSResourceID,
 		},
 	}
 
@@ -440,6 +447,9 @@ func TestRoundTripSerialization(t *testing.T) {
 	if env.ResourceIdentifiers.OperationalInsights != testSubject.ResourceIdentifiers.OperationalInsights {
 		t.Errorf("Expected ResourceIdentifiers.OperationalInsights to be %q, but got %q", env.ResourceIdentifiers.OperationalInsights, testSubject.ResourceIdentifiers.OperationalInsights)
 	}
+	if env.ResourceIdentifiers.OSSRDBMS != testSubject.ResourceIdentifiers.OSSRDBMS {
+		t.Errorf("Expected ResourceIdentifiers.OSSRDBMS to be %q, but got %q", env.ResourceIdentifiers.OSSRDBMS, testSubject.ResourceIdentifiers.OSSRDBMS)
+	}
 }
 
 func TestSetEnvironment(t *testing.T) {
diff --git a/autorest/azure/testdata/test_environment_1.json b/autorest/azure/testdata/test_environment_1.json
@@ -26,6 +26,7 @@
         "datalake": "--datalake-resource-id--",
         "graph": "--graph-resource-id--",
         "keyVault": "--keyvault-resource-id--",
-        "operationalInsights": "--operational-insights-resource-id--"
+        "operationalInsights": "--operational-insights-resource-id--",
+        "ossRDBMS": "--oss-rdbms-resource-id--"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ const (`
`33`	`33`	`graphResourceID = "--graph-resource-id--"`
`34`	`34`	`keyvaultResourceID = "--keyvault-resource-id--"`
`35`	`35`	`opInsightsResourceID = "--operational-insights-resource-id--"`
	`36`	`+ ossRDBMSResourceID = "--oss-rdbms-resource-id--"`
`36`	`37`	`)`
`37`	`38`
`38`	`39`	`// This correlates to the expected contents of ./testdata/test_environment_1.json`
`@@ -65,6 +66,7 @@ var testEnvironment1 = Environment{`
`65`	`66`	`Graph: graphResourceID,`
`66`	`67`	`KeyVault: keyvaultResourceID,`
`67`	`68`	`OperationalInsights: opInsightsResourceID,`
	`69`	`+ OSSRDBMS: ossRDBMSResourceID,`
`68`	`70`	`},`
`69`	`71`	`}`
`70`	`72`
`@@ -225,7 +227,8 @@ func TestDeserializeEnvironment(t *testing.T) {`
`225`	`227`	"datalake": "` + datalakeResourceID + `",
`226`	`228`	"graph": "` + graphResourceID + `",
`227`	`229`	"keyVault": "` + keyvaultResourceID + `",
`228`		- "operationalInsights": "` + opInsightsResourceID + `"
	`230`	+ "operationalInsights": "` + opInsightsResourceID + `",
	`231`	+ "ossRDBMS": "` + ossRDBMSResourceID + `"
`229`	`232`	`}`
`230`	`233`	}`
`231`	`234`
`@@ -313,6 +316,9 @@ func TestDeserializeEnvironment(t *testing.T) {`
`313`	`316`	`if opInsightsResourceID != testSubject.ResourceIdentifiers.OperationalInsights {`
`314`	`317`	`t.Errorf("Expected ResourceIdentifiers.OperationalInsights to be "+opInsightsResourceID+", but got %q", testSubject.ResourceIdentifiers.OperationalInsights)`
`315`	`318`	`}`
	`319`	`+ if ossRDBMSResourceID != testSubject.ResourceIdentifiers.OSSRDBMS {`
	`320`	`+ t.Errorf("Expected ResourceIdentifiers.OperationalInsights to be "+ossRDBMSResourceID+", but got %q", testSubject.ResourceIdentifiers.OSSRDBMS)`
	`321`	`+ }`
`316`	`322`	`}`
`317`	`323`
`318`	`324`	`func TestRoundTripSerialization(t *testing.T) {`
`@@ -345,6 +351,7 @@ func TestRoundTripSerialization(t *testing.T) {`
`345`	`351`	`Graph: graphResourceID,`
`346`	`352`	`KeyVault: keyvaultResourceID,`
`347`	`353`	`OperationalInsights: opInsightsResourceID,`
	`354`	`+ OSSRDBMS: ossRDBMSResourceID,`
`348`	`355`	`},`
`349`	`356`	`}`
`350`	`357`
`@@ -440,6 +447,9 @@ func TestRoundTripSerialization(t *testing.T) {`
`440`	`447`	`if env.ResourceIdentifiers.OperationalInsights != testSubject.ResourceIdentifiers.OperationalInsights {`
`441`	`448`	`t.Errorf("Expected ResourceIdentifiers.OperationalInsights to be %q, but got %q", env.ResourceIdentifiers.OperationalInsights, testSubject.ResourceIdentifiers.OperationalInsights)`
`442`	`449`	`}`
	`450`	`+ if env.ResourceIdentifiers.OSSRDBMS != testSubject.ResourceIdentifiers.OSSRDBMS {`
	`451`	`+ t.Errorf("Expected ResourceIdentifiers.OSSRDBMS to be %q, but got %q", env.ResourceIdentifiers.OSSRDBMS, testSubject.ResourceIdentifiers.OSSRDBMS)`
	`452`	`+ }`
`443`	`453`	`}`
`444`	`454`
`445`	`455`	`func TestSetEnvironment(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`"datalake": "--datalake-resource-id--",`
`27`	`27`	`"graph": "--graph-resource-id--",`
`28`	`28`	`"keyVault": "--keyvault-resource-id--",`
`29`		`- "operationalInsights": "--operational-insights-resource-id--"`
	`29`	`+ "operationalInsights": "--operational-insights-resource-id--",`
	`30`	`+ "ossRDBMS": "--oss-rdbms-resource-id--"`
`30`	`31`	`}`
`31`	`32`	`}`