Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/hashicorp/hcl/v2 v2.24.0
github.com/hashicorp/terraform-json v0.27.2
github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20260602172209-fb50b62c5fbc
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20260602184719-11c414cc2f63
github.com/mitchellh/go-homedir v1.1.0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1 h1:2yPUd7esMOpuTaG3y1iEla1i
github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1/go.mod h1:sq8qsxh+PwdvTQFcd17kfCoBgQo46ADNMvCpKE7t/gY=
github.com/hashicorp/terraform-plugin-testing v1.15.0 h1:/fimKyl0YgD7aAtJkuuAZjwBASXhCIwWqMbDLnKLMe4=
github.com/hashicorp/terraform-plugin-testing v1.15.0/go.mod h1:bGXMw7bE95EiZhSBV3rM2W8TiffaPTDuLS+HFI/lIYs=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20260602172209-fb50b62c5fbc h1:dp7XKxjGr09k9d9Pzi6dggVm1wBnBwuRlsfOoGj+p/Y=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20260602172209-fb50b62c5fbc/go.mod h1:L2DsgkalAwUunCiZtPSaSYjTkGeYqjlRufNNrWRgg0s=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20260602184719-11c414cc2f63 h1:ih459GDoWgmJOxxYcMsdwagIBV/eAHS+gj8EmZSiYNU=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20260602184719-11c414cc2f63/go.mod h1:L2DsgkalAwUunCiZtPSaSYjTkGeYqjlRufNNrWRgg0s=
github.com/hashicorp/terraform-registry-address v0.4.0 h1:S1yCGomj30Sao4l5BMPjTGZmCNzuv7/GDTDX99E9gTk=
github.com/hashicorp/terraform-registry-address v0.4.0/go.mod h1:LRS1Ay0+mAiRkUyltGT+UHWkIqTFvigGn/LbMshfflE=
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ func GetDataplexDataProductCaiObject(d tpgresource.TerraformResourceData, config

func GetDataplexDataProductApiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]interface{}, error) {
obj := make(map[string]interface{})
accessApprovalConfigProp, err := expandDataplexDataProductAccessApprovalConfig(d.Get("access_approval_config"), d, config)
if err != nil {
return nil, err
} else if v, ok := d.GetOkExists("access_approval_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(accessApprovalConfigProp)) && (ok || !reflect.DeepEqual(v, accessApprovalConfigProp)) {
obj["accessApprovalConfig"] = accessApprovalConfigProp
}
displayNameProp, err := expandDataplexDataProductDisplayName(d.Get("display_name"), d, config)
if err != nil {
return nil, err
Expand Down Expand Up @@ -144,6 +150,32 @@ func GetDataplexDataProductApiObject(d tpgresource.TerraformResourceData, config
return obj, nil
}

func expandDataplexDataProductAccessApprovalConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
if v == nil {
return nil, nil
}
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{})

transformedApproverEmails, err := expandDataplexDataProductAccessApprovalConfigApproverEmails(original["approver_emails"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedApproverEmails); val.IsValid() && !tpgresource.IsEmptyValue(val) {
transformed["approverEmails"] = transformedApproverEmails
}

return transformed, nil
}

func expandDataplexDataProductAccessApprovalConfigApproverEmails(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
return v, nil
}

func expandDataplexDataProductDisplayName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
return v, nil
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
// ----------------------------------------------------------------------------
//
// *** AUTO GENERATED CODE *** Type: MMv1 ***
//
// ----------------------------------------------------------------------------
//
// This code is generated by Magic Modules using the following:
//
// Configuration: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products/dataplex/DataProduct.yaml
// Template: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/templates/tgc/resource_converter_iam.go.tmpl
//
// DO NOT EDIT this file directly. Any changes made to this file will be
// overwritten during the next generation cycle.
//
// ----------------------------------------------------------------------------

package dataplex

import (
"fmt"

"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"
)

// Provide a separate asset type constant so we don't have to worry about name conflicts between IAM and non-IAM converter files
const DataplexDataProductIAMAssetType string = "dataplex.googleapis.com/DataProduct"

func ResourceConverterDataplexDataProductIamPolicy() cai.ResourceConverter {
return cai.ResourceConverter{
AssetType: DataplexDataProductIAMAssetType,
Convert: GetDataplexDataProductIamPolicyCaiObject,
MergeCreateUpdate: MergeDataplexDataProductIamPolicy,
}
}

func ResourceConverterDataplexDataProductIamBinding() cai.ResourceConverter {
return cai.ResourceConverter{
AssetType: DataplexDataProductIAMAssetType,
Convert: GetDataplexDataProductIamBindingCaiObject,
FetchFullResource: FetchDataplexDataProductIamPolicy,
MergeCreateUpdate: MergeDataplexDataProductIamBinding,
MergeDelete: MergeDataplexDataProductIamBindingDelete,
}
}

func ResourceConverterDataplexDataProductIamMember() cai.ResourceConverter {
return cai.ResourceConverter{
AssetType: DataplexDataProductIAMAssetType,
Convert: GetDataplexDataProductIamMemberCaiObject,
FetchFullResource: FetchDataplexDataProductIamPolicy,
MergeCreateUpdate: MergeDataplexDataProductIamMember,
MergeDelete: MergeDataplexDataProductIamMemberDelete,
}
}

func GetDataplexDataProductIamPolicyCaiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) ([]cai.Asset, error) {
return newDataplexDataProductIamAsset(d, config, cai.ExpandIamPolicyBindings)
}

func GetDataplexDataProductIamBindingCaiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) ([]cai.Asset, error) {
return newDataplexDataProductIamAsset(d, config, cai.ExpandIamRoleBindings)
}

func GetDataplexDataProductIamMemberCaiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) ([]cai.Asset, error) {
return newDataplexDataProductIamAsset(d, config, cai.ExpandIamMemberBindings)
}

func MergeDataplexDataProductIamPolicy(existing, incoming cai.Asset) cai.Asset {
existing.IAMPolicy = incoming.IAMPolicy
return existing
}

func MergeDataplexDataProductIamBinding(existing, incoming cai.Asset) cai.Asset {
return cai.MergeIamAssets(existing, incoming, cai.MergeAuthoritativeBindings)
}

func MergeDataplexDataProductIamBindingDelete(existing, incoming cai.Asset) cai.Asset {
return cai.MergeDeleteIamAssets(existing, incoming, cai.MergeDeleteAuthoritativeBindings)
}

func MergeDataplexDataProductIamMember(existing, incoming cai.Asset) cai.Asset {
return cai.MergeIamAssets(existing, incoming, cai.MergeAdditiveBindings)
}

func MergeDataplexDataProductIamMemberDelete(existing, incoming cai.Asset) cai.Asset {
return cai.MergeDeleteIamAssets(existing, incoming, cai.MergeDeleteAdditiveBindings)
}

func newDataplexDataProductIamAsset(
d tpgresource.TerraformResourceData,
config *transport_tpg.Config,
expandBindings func(d tpgresource.TerraformResourceData) ([]cai.IAMBinding, error),
) ([]cai.Asset, error) {
bindings, err := expandBindings(d)
if err != nil {
return []cai.Asset{}, fmt.Errorf("expanding bindings: %v", err)
}

name, err := cai.AssetName(d, config, "//dataplex.googleapis.com/projects/{{project}}/locations/{{location}}/dataProducts/{{data_product_id}}")
if err != nil {
return []cai.Asset{}, err
}

return []cai.Asset{{
Name: name,
Type: DataplexDataProductIAMAssetType,
IAMPolicy: &cai.IAMPolicy{
Bindings: bindings,
},
}}, nil
}

func FetchDataplexDataProductIamPolicy(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (cai.Asset, error) {
// Check if the identity field returns a value
if _, ok := d.GetOk("location"); !ok {
return cai.Asset{}, cai.ErrEmptyIdentityField
}
if _, ok := d.GetOk("data_product_id"); !ok {
return cai.Asset{}, cai.ErrEmptyIdentityField
}

return cai.FetchIamPolicy(
DataplexDataProductIamUpdaterProducer,
d,
config,
"//dataplex.googleapis.com/projects/{{project}}/locations/{{location}}/dataProducts/{{data_product_id}}",
DataplexDataProductIAMAssetType,
)
}
Loading