feat: Add converter for logging_organization_sink #3
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,209 @@ | ||
| package logging | ||
|
|
||
| import ( | ||
| "reflect" | ||
|
|
||
| "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/cai" | ||
| "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" | ||
| transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" | ||
| ) | ||
|
|
||
| func ResourceConverterLogOrganizationSink() cai.ResourceConverter { | ||
| return cai.ResourceConverter{ | ||
| AssetType: logSinkAssetType, | ||
| Convert: GetLogOrganizationSinkCaiObject, | ||
| } | ||
| } | ||
|
|
||
| func GetLogOrganizationSinkCaiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) ([]cai.Asset, error) { | ||
| name, err := cai.AssetName(d, config, "//logging.googleapis.com/organizations/{{org_id}}/sinks/{{name}}") | ||
| if err != nil { | ||
| return []cai.Asset{}, err | ||
| } | ||
| obj, err := GetLogOrganizationSinkApiObject(d, config) | ||
| if err != nil { | ||
| return []cai.Asset{}, err | ||
| } | ||
| return []cai.Asset{{ | ||
| Name: name, | ||
| Type: logSinkAssetType, | ||
| Resource: &cai.AssetResource{ | ||
| Version: "v2", | ||
| DiscoveryDocumentURI: "https://logging.googleapis.com/$discovery/rest?version=v2", | ||
| DiscoveryName: "LogSink", | ||
| Data: obj, | ||
| }, | ||
| }}, nil | ||
| } | ||
|
|
||
| func GetLogOrganizationSinkApiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]interface{}, error) { | ||
| obj := make(map[string]interface{}) | ||
|
|
||
| nameProp, err := expandLogOrganizationSinkName(d.Get("name"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("name"); !tpgresource.IsEmptyValue(reflect.ValueOf(nameProp)) && (ok || !reflect.DeepEqual(v, nameProp)) { | ||
| obj["name"] = nameProp | ||
| } | ||
|
|
||
| destinationProp, err := expandLogOrganizationSinkDestination(d.Get("destination"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("destination"); !tpgresource.IsEmptyValue(reflect.ValueOf(destinationProp)) && (ok || !reflect.DeepEqual(v, destinationProp)) { | ||
| obj["destination"] = destinationProp | ||
| } | ||
|
|
||
| filterProp, err := expandLogOrganizationSinkFilter(d.Get("filter"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("filter"); !tpgresource.IsEmptyValue(reflect.ValueOf(filterProp)) && (ok || !reflect.DeepEqual(v, filterProp)) { | ||
| obj["filter"] = filterProp | ||
| } | ||
|
|
||
| descriptionProp, err := expandLogOrganizationSinkDescription(d.Get("description"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("description"); !tpgresource.IsEmptyValue(reflect.ValueOf(descriptionProp)) && (ok || !reflect.DeepEqual(v, descriptionProp)) { | ||
| obj["description"] = descriptionProp | ||
| } | ||
|
|
||
| disabledProp, err := expandLogOrganizationSinkDisabled(d.Get("disabled"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("disabled"); !tpgresource.IsEmptyValue(reflect.ValueOf(disabledProp)) && (ok || !reflect.DeepEqual(v, disabledProp)) { | ||
| obj["disabled"] = disabledProp | ||
| } | ||
|
|
||
| exclusionsProp, err := expandLogOrganizationSinkExclusions(d.Get("exclusions"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("exclusions"); !tpgresource.IsEmptyValue(reflect.ValueOf(exclusionsProp)) && (ok || !reflect.DeepEqual(v, exclusionsProp)) { | ||
| obj["exclusions"] = exclusionsProp | ||
| } | ||
|
|
||
| includeChildrenProp, err := expandLogOrganizationSinkIncludeChildren(d.Get("include_children"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("include_children"); !tpgresource.IsEmptyValue(reflect.ValueOf(includeChildrenProp)) && (ok || !reflect.DeepEqual(v, includeChildrenProp)) { | ||
| obj["includeChildren"] = includeChildrenProp | ||
| } | ||
|
|
||
|
Author
There was a problem hiding this comment. Done. I've added support for |
||
| bigqueryOptionsProp, err := expandLogOrganizationSinkBigqueryOptions(d.Get("bigquery_options"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("bigquery_options"); !tpgresource.IsEmptyValue(reflect.ValueOf(bigqueryOptionsProp)) && (ok || !reflect.DeepEqual(v, bigqueryOptionsProp)) { | ||
| obj["bigqueryOptions"] = bigqueryOptionsProp | ||
| } | ||
|
|
||
| return obj, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkDestination(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkFilter(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkDescription(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkDisabled(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkIncludeChildren(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkExclusions(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| l, ok := v.([]interface{}) | ||
| if !ok { | ||
| return nil, nil | ||
| } | ||
| req := make([]interface{}, 0, len(l)) | ||
| for _, raw := range l { | ||
| if raw == nil { | ||
| continue | ||
| } | ||
| original := raw.(map[string]interface{}) | ||
| transformed := make(map[string]interface{}) | ||
|
|
||
| transformedName, err := expandLogOrganizationSinkExclusionsName(original["name"], d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if val := reflect.ValueOf(transformedName); val.IsValid() && !tpgresource.IsEmptyValue(val) { | ||
| transformed["name"] = transformedName | ||
| } | ||
|
|
||
| transformedDescription, err := expandLogOrganizationSinkExclusionsDescription(original["description"], d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if val := reflect.ValueOf(transformedDescription); val.IsValid() && !tpgresource.IsEmptyValue(val) { | ||
| transformed["description"] = transformedDescription | ||
| } | ||
|
|
||
| transformedFilter, err := expandLogOrganizationSinkExclusionsFilter(original["filter"], d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if val := reflect.ValueOf(transformedFilter); val.IsValid() && !tpgresource.IsEmptyValue(val) { | ||
| transformed["filter"] = transformedFilter | ||
| } | ||
|
|
||
| transformedDisabled, err := expandLogOrganizationSinkExclusionsDisabled(original["disabled"], d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if val := reflect.ValueOf(transformedDisabled); val.IsValid() && !tpgresource.IsEmptyValue(val) { | ||
| transformed["disabled"] = transformedDisabled | ||
| } | ||
|
|
||
| req = append(req, transformed) | ||
| } | ||
|
|
||
| return req, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkExclusionsName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkExclusionsDescription(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkExclusionsFilter(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkExclusionsDisabled(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkBigqueryOptions(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.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{}) | ||
|
|
||
| transformedUsePartitionedTables, err := expandLogOrganizationSinkBigqueryOptionsUsePartitionedTables(original["use_partitioned_tables"], d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if val := reflect.ValueOf(transformedUsePartitionedTables); val.IsValid() && !tpgresource.IsEmptyValue(val) { | ||
| transformed["usePartitionedTables"] = transformedUsePartitionedTables | ||
| } | ||
|
|
||
| return transformed, nil | ||
| } | ||
|
|
||
| func expandLogOrganizationSinkBigqueryOptionsUsePartitionedTables(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
This file contains hidden or 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,86 @@ | ||
| [ | ||
| { | ||
| "name": "//logging.googleapis.com/organizations/{{.OrgID}}/sinks/gg-asset-88093-71a3-sink", | ||
| "asset_type": "logging.googleapis.com/LogSink", | ||
| "ancestry_path": "organizations/{{.OrgID}}", | ||
| "resource": { | ||
| "version": "v2", | ||
| "discovery_document_uri": "https://logging.googleapis.com/$discovery/rest", | ||
| "discovery_name": "LogSink", | ||
| "parent": "//cloudresourcemanager.googleapis.com/organizations/{{.OrgID}}", | ||
| "data": { | ||
| "destination": "bigquery.googleapis.com/projects/{{.Provider.project}}/datasets/my_dataset", | ||
| "exclusions": [ | ||
| { | ||
| "description": "Exclude all GCE instance logs", | ||
| "disabled": true, | ||
| "filter": "resource.type = gce_instance", | ||
| "name": "gg-asset-88093-71a3-exclusion" | ||
| } | ||
| ], | ||
| "name": "gg-asset-88093-71a3-sink" | ||
| } | ||
| }, | ||
| "ancestors": [ | ||
| "organizations/{{.OrgID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "//logging.googleapis.com/organizations/{{.OrgID}}/sinks/gg-asset-88093-71a3-sink-with-children", | ||
| "asset_type": "logging.googleapis.com/LogSink", | ||
| "ancestry_path": "organizations/{{.OrgID}}", | ||
| "resource": { | ||
| "version": "v2", | ||
| "discovery_document_uri": "https://logging.googleapis.com/$discovery/rest", | ||
| "discovery_name": "LogSink", | ||
| "parent": "//cloudresourcemanager.googleapis.com/organizations/{{.OrgID}}", | ||
| "data": { | ||
| "destination": "bigquery.googleapis.com/projects/{{.Provider.project}}/datasets/my_dataset", | ||
| "exclusions": [ | ||
| { | ||
| "description": "Exclude all GCE instance logs", | ||
| "disabled": true, | ||
| "filter": "resource.type = gce_instance", | ||
| "name": "gg-asset-88093-71a3-exclusion" | ||
| } | ||
| ], | ||
| "includeChildren": true, | ||
| "name": "gg-asset-88093-71a3-sink-with-children" | ||
| } | ||
| }, | ||
| "ancestors": [ | ||
| "organizations/{{.OrgID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "//bigquery.googleapis.com/projects/{{.Provider.project}}/datasets/my_dataset", | ||
| "asset_type": "bigquery.googleapis.com/Dataset", | ||
| "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}", | ||
| "resource": { | ||
| "version": "v2", | ||
| "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/bigquery/v2/rest", | ||
| "discovery_name": "Dataset", | ||
| "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}", | ||
| "data": { | ||
| "datasetReference": { | ||
| "datasetId": "my_dataset" | ||
| }, | ||
| "friendlyName": "", | ||
| "labels": { | ||
| "goog-terraform-provisioned": "true" | ||
| }, | ||
| "location": "US" | ||
| } | ||
| }, | ||
| "iam_policy": { | ||
| "bindings": [ | ||
| { | ||
| "role": "roles/bigquery.dataEditor", | ||
| "members": [ | ||
| "" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] |
This file contains hidden or 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,38 @@ | ||
| resource "google_bigquery_dataset" "my_dataset" { | ||
| project = "{{.Provider.project}}" | ||
| dataset_id = "my_dataset" | ||
| location = "US" | ||
| } | ||
|
|
||
| resource "google_logging_organization_sink" "my_sink" { | ||
| name = "gg-asset-88093-71a3-sink" | ||
| org_id = "{{.OrgID}}" | ||
| destination = "bigquery.googleapis.com/projects/{{.Provider.project}}/datasets/${google_bigquery_dataset.my_dataset.dataset_id}" | ||
| include_children = false | ||
| exclusions { | ||
| name = "gg-asset-88093-71a3-exclusion" | ||
| description = "Exclude all GCE instance logs" | ||
| filter = "resource.type = gce_instance" | ||
| disabled = true | ||
| } | ||
| } | ||
|
|
||
| resource "google_bigquery_dataset_iam_member" "my_iam" { | ||
| project = "{{.Provider.project}}" | ||
| dataset_id = google_bigquery_dataset.my_dataset.dataset_id | ||
| role = "roles/bigquery.dataEditor" | ||
| member = google_logging_organization_sink.my_sink.writer_identity | ||
| } | ||
|
|
||
| resource "google_logging_organization_sink" "my_sink_with_children" { | ||
| name = "gg-asset-88093-71a3-sink-with-children" | ||
| org_id = "{{.OrgID}}" | ||
| destination = "bigquery.googleapis.com/projects/{{.Provider.project}}/datasets/${google_bigquery_dataset.my_dataset.dataset_id}" | ||
| include_children = true | ||
| exclusions { | ||
| name = "gg-asset-88093-71a3-exclusion" | ||
| description = "Exclude all GCE instance logs" | ||
| filter = "resource.type = gce_instance" | ||
| disabled = true | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove
?version=v2There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.