Add options field to UC catalog resource to support foreign catalog creation (#2616)

* Done

* Done

* test

* fix

* format

* Done

* Done

* Done

* Done

Author: andrewli81

catalog/resource_catalog.go

@@ -33,6 +33,7 @@ type CatalogInfo struct {
 	ProviderName   string            `json:"provider_name,omitempty" tf:"force_new,conflicts:storage_root"`
 	ShareName      string            `json:"share_name,omitempty" tf:"force_new,conflicts:storage_root"`
 	ConnectionName string            `json:"connection_name,omitempty" tf:"force_new,conflicts:storage_root"`
+	Options        map[string]string `json:"options,omitempty" tf:"force_new"`
 	Properties     map[string]string `json:"properties,omitempty"`
 	Owner          string            `json:"owner,omitempty" tf:"computed"`
 	IsolationMode  string            `json:"isolation_mode,omitempty" tf:"computed"`

catalog/resource_catalog_test.go

@@ -396,6 +396,68 @@ func TestCatalogCreateDeltaSharing(t *testing.T) {
 	}.ApplyNoError(t)
 }
 
+func TestCatalogCreateForeign(t *testing.T) {
+	d, err := qa.ResourceFixture{
+		Fixtures: []qa.HTTPFixture{
+			{
+				Method:   "POST",
+				Resource: "/api/2.1/unity-catalog/catalogs",
+				ExpectedRequest: catalog.CatalogInfo{
+					Name:    "foreign_catalog",
+					Comment: "b",
+					Options: map[string]string{
+						"database": "abcd",
+					},
+					ConnectionName: "foo",
+				},
+				Response: catalog.CatalogInfo{
+					Name:    "foreign_catalog",
+					Comment: "b",
+					Options: map[string]string{
+						"database": "abcd",
+					},
+					ConnectionName: "foo",
+					MetastoreId:    "e",
+					Owner:          "f",
+				},
+			},
+			{
+				Method:   "DELETE",
+				Resource: "/api/2.1/unity-catalog/schemas/foreign_catalog.default?",
+			},
+			{
+				Method:   "GET",
+				Resource: "/api/2.1/unity-catalog/catalogs/foreign_catalog?",
+				Response: catalog.CatalogInfo{
+					Name:    "foreign_catalog",
+					Comment: "b",
+					Options: map[string]string{
+						"database": "abcd",
+					},
+					ConnectionName: "foo",
+					MetastoreId:    "e",
+					Owner:          "f",
+				},
+			},
+		},
+		Resource: ResourceCatalog(),
+		Create:   true,
+		HCL: `
+		name = "foreign_catalog"
+		comment = "b"
+		options = {
+			database = "abcd"
+		}
+		connection_name = "foo"
+		`,
+	}.Apply(t)
+	assert.NoError(t, err)
+	assert.Equal(t, "foreign_catalog", d.Get("name"))
+	assert.Equal(t, "foo", d.Get("connection_name"))
+	assert.Equal(t, "b", d.Get("comment"))
+	assert.Equal(t, map[string]interface{}{"database": "abcd"}, d.Get("options"))
+}
+
 func TestCatalogCreateIsolated(t *testing.T) {
 	qa.ResourceFixture{
 		Fixtures: []qa.HTTPFixture{

docs/resources/catalog.md

@@ -33,6 +33,7 @@ The following arguments are required:
 * `isolation_mode` - (Optional) Whether the catalog is accessible from all workspaces or a specific set of workspaces. Can be `ISOLATED` or `OPEN`. Setting the catalog to `ISOLATED` will automatically allow access from the current workspace.
 * `comment` - (Optional) User-supplied free-form text.
 * `properties` - (Optional) Extensible Catalog properties.
+* `options` - (Optional) For Foreign Catalogs: the name of the entity from an external data source that maps to a catalog. For example, the database name in a PostgreSQL server.
 * `force_destroy` - (Optional) Delete catalog regardless of its contents.
 
 ## Import