Skip to content

Commit 8ba61c3

Browse files
modular-magicianmodular-magician
authored
Fix import issue for Dataplex Datascan (#8578) (#15468)
Signed-off-by: Modular Magician <[email protected]>
1 parent 140a436 commit 8ba61c3

File tree

2 files changed

+5
-362
lines changed

2 files changed

+5
-362
lines changed

‎.changelog/8578.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
dataplex: fixed a bug when importing `google_dataplex_datascan` after running a job
3+
```

‎google/services/dataplex/resource_dataplex_datascan.go

+2-362
Original file line numberDiff line numberDiff line change
@@ -2109,368 +2109,8 @@ func flattenDataplexDatascanDataQualityResultScannedDataIncrementalFieldEnd(v in
21092109
}
21102110

21112111
func flattenDataplexDatascanDataProfileResult(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2112-
if v == nil {
2113-
return nil
2114-
}
2115-
original := v.(map[string]interface{})
2116-
if len(original) == 0 {
2117-
return nil
2118-
}
2119-
transformed := make(map[string]interface{})
2120-
transformed["row_count"] =
2121-
flattenDataplexDatascanDataProfileResultRowCount(original["rowCount"], d, config)
2122-
transformed["profile"] =
2123-
flattenDataplexDatascanDataProfileResultProfile(original["profile"], d, config)
2124-
transformed["scanned_data"] =
2125-
flattenDataplexDatascanDataProfileResultScannedData(original["scannedData"], d, config)
2126-
return []interface{}{transformed}
2127-
}
2128-
func flattenDataplexDatascanDataProfileResultRowCount(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2129-
return v
2130-
}
2131-
2132-
func flattenDataplexDatascanDataProfileResultProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2133-
if v == nil {
2134-
return nil
2135-
}
2136-
original := v.(map[string]interface{})
2137-
if len(original) == 0 {
2138-
return nil
2139-
}
2140-
transformed := make(map[string]interface{})
2141-
transformed["fields"] =
2142-
flattenDataplexDatascanDataProfileResultProfileFields(original["fields"], d, config)
2143-
return []interface{}{transformed}
2144-
}
2145-
func flattenDataplexDatascanDataProfileResultProfileFields(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2146-
if v == nil {
2147-
return v
2148-
}
2149-
l := v.([]interface{})
2150-
transformed := make([]interface{}, 0, len(l))
2151-
for _, raw := range l {
2152-
original := raw.(map[string]interface{})
2153-
if len(original) < 1 {
2154-
// Do not include empty json objects coming back from the api
2155-
continue
2156-
}
2157-
transformed = append(transformed, map[string]interface{}{
2158-
"name": flattenDataplexDatascanDataProfileResultProfileFieldsName(original["name"], d, config),
2159-
"type": flattenDataplexDatascanDataProfileResultProfileFieldsType(original["type"], d, config),
2160-
"mode": flattenDataplexDatascanDataProfileResultProfileFieldsMode(original["mode"], d, config),
2161-
"profile": flattenDataplexDatascanDataProfileResultProfileFieldsProfile(original["profile"], d, config),
2162-
})
2163-
}
2164-
return transformed
2165-
}
2166-
func flattenDataplexDatascanDataProfileResultProfileFieldsName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2167-
return v
2168-
}
2169-
2170-
func flattenDataplexDatascanDataProfileResultProfileFieldsType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2171-
return v
2172-
}
2173-
2174-
func flattenDataplexDatascanDataProfileResultProfileFieldsMode(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2175-
return v
2176-
}
2177-
2178-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2179-
if v == nil {
2180-
return nil
2181-
}
2182-
original := v.(map[string]interface{})
2183-
if len(original) == 0 {
2184-
return nil
2185-
}
2186-
transformed := make(map[string]interface{})
2187-
transformed["null_ratio"] =
2188-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileNullRatio(original["nullRatio"], d, config)
2189-
transformed["distinct_ratio"] =
2190-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDistinctRatio(original["distinctRatio"], d, config)
2191-
transformed["top_n_values"] =
2192-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValues(original["topNValues"], d, config)
2193-
transformed["string_profile"] =
2194-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfile(original["stringProfile"], d, config)
2195-
transformed["integer_profile"] =
2196-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfile(original["integerProfile"], d, config)
2197-
transformed["double_profile"] =
2198-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfile(original["doubleProfile"], d, config)
2199-
return []interface{}{transformed}
2200-
}
2201-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileNullRatio(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2202-
// Handles the string fixed64 format
2203-
if strVal, ok := v.(string); ok {
2204-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2205-
return intVal
2206-
}
2207-
}
2208-
2209-
// number values are represented as float64
2210-
if floatVal, ok := v.(float64); ok {
2211-
intVal := int(floatVal)
2212-
return intVal
2213-
}
2214-
2215-
return v // let terraform core handle it otherwise
2216-
}
2217-
2218-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDistinctRatio(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2219-
// Handles the string fixed64 format
2220-
if strVal, ok := v.(string); ok {
2221-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2222-
return intVal
2223-
}
2224-
}
2225-
2226-
// number values are represented as float64
2227-
if floatVal, ok := v.(float64); ok {
2228-
intVal := int(floatVal)
2229-
return intVal
2230-
}
2231-
2232-
return v // let terraform core handle it otherwise
2233-
}
2234-
2235-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValues(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2236-
if v == nil {
2237-
return nil
2238-
}
2239-
original := v.(map[string]interface{})
2240-
if len(original) == 0 {
2241-
return nil
2242-
}
2243-
transformed := make(map[string]interface{})
2244-
transformed["value"] =
2245-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesValue(original["value"], d, config)
2246-
transformed["count"] =
2247-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesCount(original["count"], d, config)
2248-
return []interface{}{transformed}
2249-
}
2250-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesValue(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2251-
return v
2252-
}
2253-
2254-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileTopNValuesCount(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2255-
return v
2256-
}
2257-
2258-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2259-
if v == nil {
2260-
return nil
2261-
}
2262-
original := v.(map[string]interface{})
2263-
if len(original) == 0 {
2264-
return nil
2265-
}
2266-
transformed := make(map[string]interface{})
2267-
transformed["min_length"] =
2268-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMinLength(original["minLength"], d, config)
2269-
transformed["max_length"] =
2270-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMaxLength(original["maxLength"], d, config)
2271-
transformed["average_length"] =
2272-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileAverageLength(original["averageLength"], d, config)
2273-
return []interface{}{transformed}
2274-
}
2275-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMinLength(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2276-
return v
2277-
}
2278-
2279-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileMaxLength(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2280-
return v
2281-
}
2282-
2283-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileStringProfileAverageLength(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2284-
// Handles the string fixed64 format
2285-
if strVal, ok := v.(string); ok {
2286-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2287-
return intVal
2288-
}
2289-
}
2290-
2291-
// number values are represented as float64
2292-
if floatVal, ok := v.(float64); ok {
2293-
intVal := int(floatVal)
2294-
return intVal
2295-
}
2296-
2297-
return v // let terraform core handle it otherwise
2298-
}
2299-
2300-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2301-
if v == nil {
2302-
return nil
2303-
}
2304-
original := v.(map[string]interface{})
2305-
if len(original) == 0 {
2306-
return nil
2307-
}
2308-
transformed := make(map[string]interface{})
2309-
transformed["average"] =
2310-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileAverage(original["average"], d, config)
2311-
transformed["standard_deviation"] =
2312-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileStandardDeviation(original["standardDeviation"], d, config)
2313-
transformed["min"] =
2314-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMin(original["min"], d, config)
2315-
transformed["quartiles"] =
2316-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileQuartiles(original["quartiles"], d, config)
2317-
transformed["max"] =
2318-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMax(original["max"], d, config)
2319-
return []interface{}{transformed}
2320-
}
2321-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileAverage(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2322-
// Handles the string fixed64 format
2323-
if strVal, ok := v.(string); ok {
2324-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2325-
return intVal
2326-
}
2327-
}
2328-
2329-
// number values are represented as float64
2330-
if floatVal, ok := v.(float64); ok {
2331-
intVal := int(floatVal)
2332-
return intVal
2333-
}
2334-
2335-
return v // let terraform core handle it otherwise
2336-
}
2337-
2338-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileStandardDeviation(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2339-
// Handles the string fixed64 format
2340-
if strVal, ok := v.(string); ok {
2341-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2342-
return intVal
2343-
}
2344-
}
2345-
2346-
// number values are represented as float64
2347-
if floatVal, ok := v.(float64); ok {
2348-
intVal := int(floatVal)
2349-
return intVal
2350-
}
2351-
2352-
return v // let terraform core handle it otherwise
2353-
}
2354-
2355-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMin(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2356-
return v
2357-
}
2358-
2359-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileQuartiles(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2360-
return v
2361-
}
2362-
2363-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileIntegerProfileMax(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2364-
return v
2365-
}
2366-
2367-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfile(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2368-
if v == nil {
2369-
return nil
2370-
}
2371-
original := v.(map[string]interface{})
2372-
if len(original) == 0 {
2373-
return nil
2374-
}
2375-
transformed := make(map[string]interface{})
2376-
transformed["average"] =
2377-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileAverage(original["average"], d, config)
2378-
transformed["standard_deviation"] =
2379-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileStandardDeviation(original["standardDeviation"], d, config)
2380-
transformed["min"] =
2381-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMin(original["min"], d, config)
2382-
transformed["quartiles"] =
2383-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileQuartiles(original["quartiles"], d, config)
2384-
transformed["max"] =
2385-
flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMax(original["max"], d, config)
2386-
return []interface{}{transformed}
2387-
}
2388-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileAverage(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2389-
// Handles the string fixed64 format
2390-
if strVal, ok := v.(string); ok {
2391-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2392-
return intVal
2393-
}
2394-
}
2395-
2396-
// number values are represented as float64
2397-
if floatVal, ok := v.(float64); ok {
2398-
intVal := int(floatVal)
2399-
return intVal
2400-
}
2401-
2402-
return v // let terraform core handle it otherwise
2403-
}
2404-
2405-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileStandardDeviation(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2406-
// Handles the string fixed64 format
2407-
if strVal, ok := v.(string); ok {
2408-
if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
2409-
return intVal
2410-
}
2411-
}
2412-
2413-
// number values are represented as float64
2414-
if floatVal, ok := v.(float64); ok {
2415-
intVal := int(floatVal)
2416-
return intVal
2417-
}
2418-
2419-
return v // let terraform core handle it otherwise
2420-
}
2421-
2422-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMin(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2423-
return v
2424-
}
2425-
2426-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileQuartiles(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2427-
return v
2428-
}
2429-
2430-
func flattenDataplexDatascanDataProfileResultProfileFieldsProfileDoubleProfileMax(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2431-
return v
2432-
}
2433-
2434-
func flattenDataplexDatascanDataProfileResultScannedData(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2435-
if v == nil {
2436-
return nil
2437-
}
2438-
original := v.(map[string]interface{})
2439-
if len(original) == 0 {
2440-
return nil
2441-
}
2442-
transformed := make(map[string]interface{})
2443-
transformed["incremental_field"] =
2444-
flattenDataplexDatascanDataProfileResultScannedDataIncrementalField(original["incrementalField"], d, config)
2445-
return []interface{}{transformed}
2446-
}
2447-
func flattenDataplexDatascanDataProfileResultScannedDataIncrementalField(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2448-
if v == nil {
2449-
return nil
2450-
}
2451-
original := v.(map[string]interface{})
2452-
if len(original) == 0 {
2453-
return nil
2454-
}
2455-
transformed := make(map[string]interface{})
2456-
transformed["field"] =
2457-
flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldField(original["field"], d, config)
2458-
transformed["start"] =
2459-
flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldStart(original["start"], d, config)
2460-
transformed["end"] =
2461-
flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldEnd(original["end"], d, config)
2462-
return []interface{}{transformed}
2463-
}
2464-
func flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldField(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2465-
return v
2466-
}
2467-
2468-
func flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldStart(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2469-
return v
2470-
}
2471-
2472-
func flattenDataplexDatascanDataProfileResultScannedDataIncrementalFieldEnd(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
2473-
return v
2112+
// We want to ignore read on this field, but cannot because it is nested
2113+
return nil
24742114
}
24752115

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

0 commit comments

Comments
 (0)