-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add data catalog tag * add data catalog tag * fix missing err check * update after review comments * fixing a bad diff * update per code review comments * update fields values to camel case in ruby
- Loading branch information
Showing
11 changed files
with
624 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <%# # the license inside this if block pertains to this file | ||
| # Copyright 2020 Google Inc. | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| #%> | ||
| func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { | ||
| // we flattened the original["enum_value"]["display_name"] object to be just original["enum_value"] so here, | ||
| // v is the value we want from the config | ||
| transformed := make(map[string]interface{}) | ||
| if val := reflect.ValueOf(v); val.IsValid() && !isEmptyValue(val) { | ||
| transformed["displayName"] = v | ||
| } | ||
|
|
||
| return transformed, nil | ||
| } |
21 changes: 21 additions & 0 deletions
21
templates/terraform/custom_flatten/data_catalog_tag.go.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <%# The license inside this block applies to this file. | ||
| # Copyright 2020 Google Inc. | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| -%> | ||
| func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData, config *Config) interface{} { | ||
| if v == nil { | ||
| return nil | ||
| } | ||
|
|
||
| return v.(map[string]interface{})["displayName"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| config := meta.(*Config) | ||
|
|
||
| // current import_formats can't import fields with forward slashes in their value | ||
| if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| name := d.Get("name").(string) | ||
| egRegex := regexp.MustCompile("(.+)/tags") | ||
|
|
||
| parts := egRegex.FindStringSubmatch(name) | ||
| if len(parts) != 2 { | ||
| return nil, fmt.Errorf("entry name does not fit the format %s", egRegex) | ||
| } | ||
|
|
||
| d.Set("parent", parts[1]) | ||
| return []*schema.ResourceData{d}, nil |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
templates/terraform/examples/data_catalog_entry_group_tag.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| resource "google_data_catalog_entry" "first_entry" { | ||
| entry_group = google_data_catalog_entry_group.entry_group.id | ||
| entry_id = "<%= ctx[:vars]['first_entry'] %>" | ||
|
|
||
| user_specified_type = "my_custom_type" | ||
| user_specified_system = "SomethingExternal" | ||
| } | ||
|
|
||
| resource "google_data_catalog_entry" "second_entry" { | ||
| entry_group = google_data_catalog_entry_group.entry_group.id | ||
| entry_id = "<%= ctx[:vars]['second_entry'] %>" | ||
|
|
||
| user_specified_type = "another_custom_type" | ||
| user_specified_system = "SomethingElseExternal" | ||
| } | ||
|
|
||
| resource "google_data_catalog_entry_group" "entry_group" { | ||
| entry_group_id = "<%= ctx[:vars]['entry_group_id'] %>" | ||
| } | ||
|
|
||
| resource "google_data_catalog_tag_template" "tag_template" { | ||
| tag_template_id = "<%= ctx[:vars]['tag_template_id'] %>" | ||
| region = "us-central1" | ||
| display_name = "Demo Tag Template" | ||
|
|
||
| fields { | ||
| field_id = "source" | ||
| display_name = "Source of data asset" | ||
| type { | ||
| primitive_type = "STRING" | ||
| } | ||
| is_required = true | ||
| } | ||
|
|
||
| fields { | ||
| field_id = "num_rows" | ||
| display_name = "Number of rows in the data asset" | ||
| type { | ||
| primitive_type = "DOUBLE" | ||
| } | ||
| } | ||
|
|
||
| fields { | ||
| field_id = "pii_type" | ||
| display_name = "PII type" | ||
| type { | ||
| enum_type { | ||
| allowed_values { | ||
| display_name = "EMAIL" | ||
| } | ||
| allowed_values { | ||
| display_name = "SOCIAL SECURITY NUMBER" | ||
| } | ||
| allowed_values { | ||
| display_name = "NONE" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| force_delete = "<%= ctx[:vars]['force_delete'] %>" | ||
| } | ||
|
|
||
| resource "google_data_catalog_tag" "<%= ctx[:primary_resource_id] %>" { | ||
| parent = google_data_catalog_entry_group.entry_group.id | ||
| template = google_data_catalog_tag_template.tag_template.id | ||
|
|
||
| fields { | ||
| field_name = "source" | ||
| string_value = "my-string" | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
templates/terraform/examples/data_catalog_entry_tag_basic.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| resource "google_data_catalog_entry" "entry" { | ||
| entry_group = google_data_catalog_entry_group.entry_group.id | ||
| entry_id = "<%= ctx[:vars]['entry_id'] %>" | ||
|
|
||
| user_specified_type = "my_custom_type" | ||
| user_specified_system = "SomethingExternal" | ||
| } | ||
|
|
||
| resource "google_data_catalog_entry_group" "entry_group" { | ||
| entry_group_id = "<%= ctx[:vars]['entry_group_id'] %>" | ||
| } | ||
|
|
||
| resource "google_data_catalog_tag_template" "tag_template" { | ||
| tag_template_id = "<%= ctx[:vars]['tag_template_id'] %>" | ||
| region = "us-central1" | ||
| display_name = "Demo Tag Template" | ||
|
|
||
| fields { | ||
| field_id = "source" | ||
| display_name = "Source of data asset" | ||
| type { | ||
| primitive_type = "STRING" | ||
| } | ||
| is_required = true | ||
| } | ||
|
|
||
| fields { | ||
| field_id = "num_rows" | ||
| display_name = "Number of rows in the data asset" | ||
| type { | ||
| primitive_type = "DOUBLE" | ||
| } | ||
| } | ||
|
|
||
| fields { | ||
| field_id = "pii_type" | ||
| display_name = "PII type" | ||
| type { | ||
| enum_type { | ||
| allowed_values { | ||
| display_name = "EMAIL" | ||
| } | ||
| allowed_values { | ||
| display_name = "SOCIAL SECURITY NUMBER" | ||
| } | ||
| allowed_values { | ||
| display_name = "NONE" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| force_delete = "<%= ctx[:vars]['force_delete'] %>" | ||
| } | ||
|
|
||
| resource "google_data_catalog_tag" "<%= ctx[:primary_resource_id] %>" { | ||
| parent = google_data_catalog_entry.entry.id | ||
| template = google_data_catalog_tag_template.tag_template.id | ||
|
|
||
| fields { | ||
| field_name = "source" | ||
| string_value = "my-string" | ||
| } | ||
| } |
Oops, something went wrong.