Skip to content

Commit

Permalink
Merge pull request #176 from modular-magician/codegen-pr-2226
Browse files Browse the repository at this point in the history
BigQuery Dataset default CMEK encryption
  • Loading branch information
slevenick authored Oct 4, 2019
2 parents 30e863c + 2e02885 commit 2114619
Showing 1 changed file with 29 additions and 0 deletions.
29 changes: 29 additions & 0 deletions google/bigquery_dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ func GetBigQueryDatasetApiObject(d TerraformResourceData, config *Config) (map[s
} else if v, ok := d.GetOkExists("location"); !isEmptyValue(reflect.ValueOf(locationProp)) && (ok || !reflect.DeepEqual(v, locationProp)) {
obj["location"] = locationProp
}
defaultEncryptionConfigurationProp, err := expandBigQueryDatasetDefaultEncryptionConfiguration(d.Get("default_encryption_configuration"), d, config)
if err != nil {
return nil, err
} else if v, ok := d.GetOkExists("default_encryption_configuration"); !isEmptyValue(reflect.ValueOf(defaultEncryptionConfigurationProp)) && (ok || !reflect.DeepEqual(v, defaultEncryptionConfigurationProp)) {
obj["defaultEncryptionConfiguration"] = defaultEncryptionConfigurationProp
}

return obj, nil
}
Expand Down Expand Up @@ -292,3 +298,26 @@ func expandBigQueryDatasetLabels(v interface{}, d TerraformResourceData, config
func expandBigQueryDatasetLocation(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandBigQueryDatasetDefaultEncryptionConfiguration(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
return nil, nil
}
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})

transformedKmsKeyName, err := expandBigQueryDatasetDefaultEncryptionConfigurationKmsKeyName(original["kms_key_name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedKmsKeyName); val.IsValid() && !isEmptyValue(val) {
transformed["kmsKeyName"] = transformedKmsKeyName
}

return transformed, nil
}

func expandBigQueryDatasetDefaultEncryptionConfigurationKmsKeyName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

0 comments on commit 2114619

Please sign in to comment.