Skip to content

Commit

Permalink
Fix import issue for Dataplex Datascan (#8578) (#15468)
Browse files Browse the repository at this point in the history 
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
@modular-magician
modular-magician authored Aug 10, 2023
1 parent 140a436 commit 8ba61c3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 362 deletions.
3 changes: 3 additions & 0 deletions .changelog/8578.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
dataplex: fixed a bug when importing `google_dataplex_datascan` after running a job
```
364 changes: 2 additions & 362 deletions google/services/dataplex/resource_dataplex_datascan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2109,368 +2109,8 @@ func flattenDataplexDatascanDataQualityResultScannedDataIncrementalFieldEnd(v in
}

func flattenDataplexDatascanDataProfileResult(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["row_count"] =
flattenDataplexDatascanDataProfileResultRowCount(original["rowCount"], d, config)
transformed["profile"] =
flattenDataplexDatascanDataProfileResultProfile(original["profile"], d, config)
transformed["scanned_data"] =
flattenDataplexDatascanDataProfileResultScannedData(original["scannedData"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultRowCount(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["fields"] =
flattenDataplexDatascanDataProfileResultProfileFields(original["fields"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultProfileFields(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return v
}
l := v.([]interface{})
transformed := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
if len(original) < 1 {
// Do not include empty json objects coming back from the api
continue
}
transformed = append(transformed, map[string]interface{}{
"name": flattenDataplexDatascanDataProfileResultProfileFieldsName(original["name"], d, config),
"type": flattenDataplexDatascanDataProfileResultProfileFieldsType(original["type"], d, config),
"mode": flattenDataplexDatascanDataProfileResultProfileFieldsMode(original["mode"], d, config),
"profile": flattenDataplexDatascanDataProfileResultProfileFieldsProfile(original["profile"], d, config),
})
}
return transformed
}
func flattenDataplexDatascanDataProfileResultProfileFieldsName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsMode(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["null_ratio"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileNullRatio(original["nullRatio"], d, config)
transformed["distinct_ratio"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDistinctRatio(original["distinctRatio"], d, config)
transformed["top_n_values"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValues(original["topNValues"], d, config)
transformed["string_profile"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfile(original["stringProfile"], d, config)
transformed["integer_profile"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfile(original["integerProfile"], d, config)
transformed["double_profile"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfile(original["doubleProfile"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileNullRatio(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDistinctRatio(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValues(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["value"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesValue(original["value"], d, config)
transformed["count"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesCount(original["count"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesValue(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesCount(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["min_length"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMinLength(original["minLength"], d, config)
transformed["max_length"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMaxLength(original["maxLength"], d, config)
transformed["average_length"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileAverageLength(original["averageLength"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMinLength(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMaxLength(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileAverageLength(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["average"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileAverage(original["average"], d, config)
transformed["standard_deviation"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileStandardDeviation(original["standardDeviation"], d, config)
transformed["min"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMin(original["min"], d, config)
transformed["quartiles"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileQuartiles(original["quartiles"], d, config)
transformed["max"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMax(original["max"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileAverage(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileStandardDeviation(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMin(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileQuartiles(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMax(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["average"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileAverage(original["average"], d, config)
transformed["standard_deviation"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileStandardDeviation(original["standardDeviation"], d, config)
transformed["min"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMin(original["min"], d, config)
transformed["quartiles"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileQuartiles(original["quartiles"], d, config)
transformed["max"] =
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMax(original["max"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileAverage(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileStandardDeviation(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
return intVal
}
}

// number values are represented as float64
if floatVal, ok := v.(float64); ok {
intVal := int(floatVal)
return intVal
}

return v // let terraform core handle it otherwise
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMin(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileQuartiles(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMax(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultScannedData(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["incremental_field"] =
flattenDataplexDatascanDataProfileResultScannedDataIncrementalField(original["incrementalField"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultScannedDataIncrementalField(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["field"] =
flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldField(original["field"], d, config)
transformed["start"] =
flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldStart(original["start"], d, config)
transformed["end"] =
flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldEnd(original["end"], d, config)
return []interface{}{transformed}
}
func flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldField(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldStart(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldEnd(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
// We want to ignore read on this field, but cannot because it is nested
return nil
}

func expandDataplexDatascanDescription(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
Expand Down

0 comments on commit 8ba61c3

Please sign in to comment.