Added - Support for LifecycleDetails in Data catalog Data assets resources

Author: santoshkatageri

internal/integrationtest/datacatalog_catalog_type_test.go

@@ -72,7 +72,7 @@ func TestDatacatalogCatalogTypeResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "catalog_id"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "fields.#", "0"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "type_key"),
-				resource.TestCheckResourceAttr(singularDatasourceName, "properties.%", "16"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "properties.%", "20"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "key"),
 			),
 		},

internal/integrationtest/datacatalog_metastore_test.go

@@ -89,7 +89,7 @@ var (
 	}
 	//Changes made for Create dependency resources
 	DatacatalogMetastoreResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", acctest.Required, acctest.Create, bucketRepresentationMetastore) +
-		acctest.GenerateDataSourceFromRepresentationMap("oci_objectstorage_namespace", "test_namespace", acctest.Required, acctest.Create, ObjectStorageObjectStorageNamespaceSingularDataSourceRepresentation) +
+		acctest.GenerateDataSourceFromRepresentationMap("oci_objectstorage_namespace", "test_namespace", acctest.Optional, acctest.Create, ObjectStorageObjectStorageNamespaceSingularDataSourceRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_objectstorage_object", "object1", acctest.Required, acctest.Create, objectRepresentationDefault) +
 		acctest.GenerateResourceFromRepresentationMap("oci_objectstorage_object", "object2", acctest.Required, acctest.Create, objectRepresentationExternal) +
 		DefinedTagsDependencies

internal/service/datacatalog/datacatalog_connection_resource.go

@@ -384,7 +384,6 @@ func (s *DatacatalogConnectionResourceCrud) SetData() error {
 	catalogId, connectionKey, dataAssetKey, err := parseConnectionCompositeId(s.D.Id())
 	if err == nil {
 		s.D.Set("catalog_id", &catalogId)
-		s.D.Set("connection_key", &connectionKey)
 		s.D.Set("data_asset_key", &dataAssetKey)
 		s.D.SetId(connectionKey)
 	} else {

internal/service/datacatalog/datacatalog_data_asset_data_source.go

@@ -38,7 +38,6 @@ func readSingularDatacatalogDataAsset(d *schema.ResourceData, m interface{}) err
 	sync := &DatacatalogDataAssetDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).DataCatalogClient()
-
 	return tfresource.ReadResource(sync)
 }
 
@@ -91,6 +90,7 @@ func (s *DatacatalogDataAssetDataSourceCrud) Get() error {
 }
 
 func (s *DatacatalogDataAssetDataSourceCrud) SetData() error {
+
 	if s.Res == nil {
 		return nil
 	}
@@ -117,6 +117,9 @@ func (s *DatacatalogDataAssetDataSourceCrud) SetData() error {
 		s.D.Set("key", *s.Res.Key)
 	}
 
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
 	if s.Res.Properties != nil {
 		s.D.Set("properties", propertiesToMap(s.Res.Properties))
 	}

internal/service/datacatalog/datacatalog_data_asset_resource.go

@@ -74,6 +74,10 @@ func DatacatalogDataAssetResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"lifecycle_details": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -214,10 +218,8 @@ func (s *DatacatalogDataAssetResourceCrud) Create() error {
 
 func (s *DatacatalogDataAssetResourceCrud) Get() error {
 	request := oci_datacatalog.GetDataAssetRequest{}
-
 	tmp := s.D.Id()
 	request.DataAssetKey = &tmp
-
 	if catalogId, ok := s.D.GetOkExists("catalog_id"); ok {
 		tmp := catalogId.(string)
 		request.CatalogId = &tmp
@@ -319,7 +321,6 @@ func (s *DatacatalogDataAssetResourceCrud) SetData() error {
 	catalogId, dataAssetKey, err := parseDataAssetCompositeId(s.D.Id())
 	if err == nil {
 		s.D.Set("catalog_id", &catalogId)
-		s.D.Set("data_asset_key", &dataAssetKey)
 		s.D.SetId(dataAssetKey)
 	} else {
 		log.Printf("[WARN] SetData() unable to parse current ID: %s", s.D.Id())
@@ -349,6 +350,10 @@ func (s *DatacatalogDataAssetResourceCrud) SetData() error {
 		s.D.Set("key", *s.Res.Key)
 	}
 
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
+
 	if s.Res.Properties != nil {
 		s.D.Set("properties", propertiesToMap(s.Res.Properties))
 	}
@@ -429,6 +434,10 @@ func DataAssetSummaryToMap(obj oci_datacatalog.DataAssetSummary) map[string]inte
 		result["key"] = string(*obj.Key)
 	}
 
+	if obj.LifecycleDetails != nil {
+		result["lifecycle_details"] = string(*obj.LifecycleDetails)
+	}
+
 	result["state"] = string(obj.LifecycleState)
 
 	if obj.TimeCreated != nil {

website/docs/d/datacatalog_data_asset.html.markdown

@@ -44,6 +44,7 @@ The following attributes are exported:
 * `display_name` - A user-friendly display name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `external_key` - External URI that can be used to reference the object. Format will differ based on the type of object. 
 * `key` - Unique data asset key that is immutable.
+* `lifecycle_details` - A message describing the current state in more detail. An object not in ACTIVE state may have functional limitations, see service documentation for details. 
 * `properties` - A map of maps that contains the properties which are specific to the asset type. Each data asset type definition defines it's set of required and optional properties. The map keys are category names and the values are maps of property name to property value. Every property is contained inside of a category. Most data assets have required properties within the "default" category. Example: `{"properties": { "default": { "host": "host1", "port": "1521", "database": "orcl"}}}` 
 * `state` - The current state of the data asset.
 * `time_created` - The date and time the data asset was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). Example: `2019-03-25T21:10:29.600Z` 

website/docs/d/datacatalog_data_assets.html.markdown

@@ -66,6 +66,7 @@ The following attributes are exported:
 * `display_name` - A user-friendly display name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `external_key` - External URI that can be used to reference the object. Format will differ based on the type of object. 
 * `key` - Unique data asset key that is immutable.
+* `lifecycle_details` - A message describing the current state in more detail. An object not in ACTIVE state may have functional limitations, see service documentation for details. 
 * `properties` - A map of maps that contains the properties which are specific to the asset type. Each data asset type definition defines it's set of required and optional properties. The map keys are category names and the values are maps of property name to property value. Every property is contained inside of a category. Most data assets have required properties within the "default" category. Example: `{"properties": { "default": { "host": "host1", "port": "1521", "database": "orcl"}}}` 
 * `state` - The current state of the data asset.
 * `time_created` - The date and time the data asset was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). Example: `2019-03-25T21:10:29.600Z` 

website/docs/r/datacatalog_data_asset.html.markdown

@@ -51,6 +51,7 @@ The following attributes are exported:
 * `display_name` - A user-friendly display name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `external_key` - External URI that can be used to reference the object. Format will differ based on the type of object. 
 * `key` - Unique data asset key that is immutable.
+* `lifecycle_details` - A message describing the current state in more detail. An object not in ACTIVE state may have functional limitations, see service documentation for details. 
 * `properties` - A map of maps that contains the properties which are specific to the asset type. Each data asset type definition defines it's set of required and optional properties. The map keys are category names and the values are maps of property name to property value. Every property is contained inside of a category. Most data assets have required properties within the "default" category. Example: `{"properties": { "default": { "host": "host1", "port": "1521", "database": "orcl"}}}` 
 * `state` - The current state of the data asset.
 * `time_created` - The date and time the data asset was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). Example: `2019-03-25T21:10:29.600Z`