Split tgc converters

GoogleCloudPlatform · Oct 1, 2024 · 0fae600 · 0fae600
1 parent 02d6c97
commit 0fae600
Show file tree

Hide file tree

Showing 51 changed files with 225 additions and 224 deletions.
diff --git a/mmv1/provider/terraform_tgc.go b/mmv1/provider/terraform_tgc.go
diff --git a/mmv1/third_party/tgc/cai/string_helpers.go b/mmv1/third_party/tgc/cai/string_helpers.go
@@ -0,0 +1,9 @@
+package cai
+
+func ConvertInterfaceToStringArray(values []interface{}) []string {
+	stringArray := make([]string, len(values))
+	for i, v := range values {
+		stringArray[i] = v.(string)
+	}
+	return stringArray
+}
diff --git a/mmv1/third_party/tgc/firebase_project.go b/mmv1/third_party/tgc/firebase_project.go
@@ -40,7 +40,7 @@ func GetFirebaseProjectCaiObject(d tpgresource.TerraformResourceData, config *tr
 
 func GetFirebaseProjectApiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]interface{}, error) {
 	obj := make(map[string]interface{})
-	
+
 	nameProp, err := expandFirebaseProjectName(d.Get("name"), d, config)
 	if err != nil {
 		return nil, err
@@ -102,4 +102,4 @@ func expandFirebaseProjectProjectId(v interface{}, d tpgresource.TerraformResour
 
 func expandFirebaseProjectName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
-}
+}
diff --git a/mmv1/third_party/tgc/resource_converters.go.tmpl b/mmv1/third_party/tgc/resource_converters.go.tmpl
diff --git a/mmv1/third_party/tgc/apikeys_key.go → ...party/tgc/services/apikeys/apikeys_key.go b/mmv1/third_party/tgc/apikeys_key.go → ...party/tgc/services/apikeys/apikeys_key.go
@@ -1,4 +1,4 @@
-package google
+package apikeys
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const ApikeysKeyAssetType string = "apikeys.googleapis.com/Key"
 
-func resourceConverterApikeysKey() cai.ResourceConverter {
+func ResourceConverterApikeysKey() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ApikeysKeyAssetType,
 		Convert:   GetApikeysKeyCaiObject,
@@ -125,7 +125,7 @@ func expandApikeysKeyDeleteTime(v interface{}, d tpgresource.TerraformResourceDa
 }
 
 func expandApikeysKeyRestrictions(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	
+
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
 		return nil, nil
@@ -203,7 +203,6 @@ func expandApikeysKeySha1Fingerprint(v interface{}, d tpgresource.TerraformResou
 	return v, nil
 }
 
-
 func expandApikeysKeyApiTargets(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
@@ -235,10 +234,9 @@ func expandApikeysKeyService(v interface{}, d tpgresource.TerraformResourceData,
 }
 
 func expandApikeysKeyMethods(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return convertInterfaceToStringArray(v.([]interface{})), nil
+	return cai.ConvertInterfaceToStringArray(v.([]interface{})), nil
 }
 
-
 func expandApikeysKeyDEtag(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
diff --git a/.../third_party/tgc/appengine_application.go → ...rvices/appengine/appengine_application.go b/.../third_party/tgc/appengine_application.go → ...rvices/appengine/appengine_application.go
@@ -1,4 +1,4 @@
-package google
+package appengine
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const AppEngineApplicationAssetType string = "appengine.googleapis.com/Application"
 
-func resourceConverterAppEngineApplication() cai.ResourceConverter {
+func ResourceConverterAppEngineApplication() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: AppEngineApplicationAssetType,
 		Convert:   GetAppEngineApplicationCaiObject,
@@ -55,15 +55,13 @@ func GetAppEngineApplicationApiObject(d tpgresource.TerraformResourceData, confi
 		obj["location_id"] = locationIdProp
 	}
 
-
 	return obj, nil
 }
 
 func expandAppEngineApplicationId(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 
-
 func expandAppEngineApplicationLocationId(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
diff --git a/...d_party/tgc/appengine_standard_version.go → ...s/appengine/appengine_standard_version.go b/...d_party/tgc/appengine_standard_version.go → ...s/appengine/appengine_standard_version.go
@@ -1,4 +1,4 @@
-package google
+package appengine
 
 import (
 	"reflect"
@@ -12,7 +12,7 @@ import (
 
 const AppEngineVersionAssetType string = "appengine.googleapis.com/Version"
 
-func resourceAppEngineStandardAppVersion() cai.ResourceConverter {
+func ResourceAppEngineStandardAppVersion() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: AppEngineVersionAssetType,
 		Convert:   GetAppEngineVersionCaiObject,

diff --git a/mmv1/third_party/tgc/bigquery_dataset_iam.go → ...services/bigquery/bigquery_dataset_iam.go b/mmv1/third_party/tgc/bigquery_dataset_iam.go → ...services/bigquery/bigquery_dataset_iam.go
diff --git a/mmv1/third_party/tgc/bigquery_table.go → ...y/tgc/services/bigquery/bigquery_table.go b/mmv1/third_party/tgc/bigquery_table.go → ...y/tgc/services/bigquery/bigquery_table.go
@@ -1,4 +1,4 @@
-package google
+package bigquery
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const BigQueryTableAssetType string = "bigquery.googleapis.com/Table"
 
-func resourceConverterBigQueryTable() cai.ResourceConverter {
+func ResourceConverterBigQueryTable() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: BigQueryTableAssetType,
 		Convert:   GetBigQueryTableCaiObject,

diff --git a/mmv1/third_party/tgc/bigtable_cluster.go → ...tgc/services/bigtable/bigtable_cluster.go b/mmv1/third_party/tgc/bigtable_cluster.go → ...tgc/services/bigtable/bigtable_cluster.go
@@ -1,4 +1,4 @@
-package google
+package bigtable
 
 import (
 	"reflect"
@@ -8,7 +8,7 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-func resourceConverterBigtableCluster() cai.ResourceConverter {
+func ResourceConverterBigtableCluster() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: "bigtableadmin.googleapis.com/Cluster",
 		Convert:   GetBigtableClusterCaiObject,

diff --git a/mmv1/third_party/tgc/bigtable_instance.go → ...gc/services/bigtable/bigtable_instance.go b/mmv1/third_party/tgc/bigtable_instance.go → ...gc/services/bigtable/bigtable_instance.go
@@ -1,4 +1,4 @@
-package google
+package bigtable
 
 import (
 	"reflect"
@@ -8,7 +8,7 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-func resourceConverterBigtableInstance() cai.ResourceConverter {
+func ResourceConverterBigtableInstance() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: "bigtableadmin.googleapis.com/Instance",
 		Convert:   GetBigtableInstanceCaiObject,

diff --git a/...arty/tgc/cloudfunctions_cloud_function.go → ...unctions/cloudfunctions_cloud_function.go b/...arty/tgc/cloudfunctions_cloud_function.go → ...unctions/cloudfunctions_cloud_function.go
@@ -1,4 +1,4 @@
-package google
+package cloudfunctions
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const CloudFunctionsCloudFunctionAssetType string = "cloudfunctions.googleapis.com/CloudFunction"
 
-func resourceConverterCloudFunctionsCloudFunction() cai.ResourceConverter {
+func ResourceConverterCloudFunctionsCloudFunction() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: CloudFunctionsCloudFunctionAssetType,
 		Convert:   GetCloudFunctionsCloudFunctionCaiObject,

diff --git a/...hird_party/tgc/cloudfunctions_function.go → ...cloudfunctions/cloudfunctions_function.go b/...hird_party/tgc/cloudfunctions_function.go → ...cloudfunctions/cloudfunctions_function.go
@@ -1,4 +1,4 @@
-package google
+package cloudfunctions
 
 import (
 	"reflect"

diff --git a/mmv1/third_party/tgc/composer_environment.go → ...services/composer/composer_environment.go b/mmv1/third_party/tgc/composer_environment.go → ...services/composer/composer_environment.go
@@ -1,4 +1,4 @@
-package google
+package composer
 
 import (
 	"reflect"
@@ -11,7 +11,7 @@ import (
 
 const ComposerEnvironmentAssetType string = "composer.googleapis.com/Environment"
 
-func resourceConverterComposerEnvironment() cai.ResourceConverter {
+func ResourceConverterComposerEnvironment() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ComposerEnvironmentAssetType,
 		Convert:   GetComposerEnvironmentCaiObject,

diff --git a/mmv1/third_party/tgc/commitment.go → ..._party/tgc/services/compute/commitment.go b/mmv1/third_party/tgc/commitment.go → ..._party/tgc/services/compute/commitment.go
@@ -1,4 +1,4 @@
-package google
+package compute
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const commitmentAssetType string = "compute.googleapis.com/Commitment"
 
-func resourceConverterCommitment() cai.ResourceConverter {
+func ResourceConverterCommitment() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: commitmentAssetType,
 		Convert:   GetCommitmentCaiObject,
@@ -152,14 +152,14 @@ func GetCommitmentApiObject(d tpgresource.TerraformResourceData, config *transpo
 	} else if v, ok := d.GetOkExists("start_timestamp"); !tpgresource.IsEmptyValue(reflect.ValueOf(statusMessageProp)) && (ok || !reflect.DeepEqual(v, statusMessageProp)) {
 		obj["startTimestamp"] = startTimestampProp
 	}
-	
+
 	endTimestampProp, err := expandCommitmentEndTimestamp(d.Get("end_timestamp"), d, config)
 	if err != nil {
 		return nil, err
 	} else if v, ok := d.GetOkExists("end_timestamp"); !tpgresource.IsEmptyValue(reflect.ValueOf(endTimestampProp)) && (ok || !reflect.DeepEqual(v, endTimestampProp)) {
 		obj["endTimestamp"] = endTimestampProp
 	}
-	
+
 	selfLinkProp, err := expandCommitmentSelfLink(d.Get("self_link"), d, config)
 	if err != nil {
 		return nil, err
@@ -323,4 +323,4 @@ func expandCommitmentPlan(v interface{}, d tpgresource.TerraformResourceData, co
 
 func expandCommitmentName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
-}
+}
diff --git a/.../third_party/tgc/compute_instance.go.tmpl → ...services/compute/compute_instance.go.tmpl b/.../third_party/tgc/compute_instance.go.tmpl → ...services/compute/compute_instance.go.tmpl
diff --git a/...third_party/tgc/compute_instance_group.go → ...ervices/compute/compute_instance_group.go b/...third_party/tgc/compute_instance_group.go → ...ervices/compute/compute_instance_group.go
@@ -1,4 +1,4 @@
-package google
+package compute
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const ComputeInstanceGroupAssetType string = "compute.googleapis.com/InstanceGroup"
 
-func resourceConverterComputeInstanceGroup() cai.ResourceConverter {
+func ResourceConverterComputeInstanceGroup() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ComputeInstanceGroupAssetType,
 		Convert:   GetComputeInstanceGroupCaiObject,
@@ -80,7 +80,7 @@ func GetComputeInstanceGroupApiObject(d tpgresource.TerraformResourceData, confi
 		}
 		url = url + zoneProp.(string)
 
-		obj["zone"] =  url
+		obj["zone"] = url
 	}
 	selfLinkProp, err := expandComputeInstanceGroupSelfLink(d.Get("self_link"), d, config)
 	if err != nil {
@@ -152,4 +152,4 @@ func expandComputeInstanceGroupRegion(v interface{}, d tpgresource.TerraformReso
 
 func expandComputeInstanceGroupSubnetwork(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
-}
+}
diff --git a/...hird_party/tgc/compute_security_policy.go → ...rvices/compute/compute_security_policy.go b/...hird_party/tgc/compute_security_policy.go → ...rvices/compute/compute_security_policy.go
@@ -1,4 +1,4 @@
-package google
+package compute
 
 import (
 	"reflect"
@@ -11,7 +11,7 @@ import (
 
 const ComputeSecurityPolicyAssetType string = "compute.googleapis.com/SecurityPolicy"
 
-func resourceConverterComputeSecurityPolicy() cai.ResourceConverter {
+func ResourceConverterComputeSecurityPolicy() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ComputeSecurityPolicyAssetType,
 		Convert:   GetComputeSecurityPolicyCaiObject,

diff --git a/mmv1/third_party/tgc/compute_target_pool.go → ...c/services/compute/compute_target_pool.go b/mmv1/third_party/tgc/compute_target_pool.go → ...c/services/compute/compute_target_pool.go
@@ -1,4 +1,4 @@
-package google
+package compute
 
 import (
 	"reflect"
@@ -11,7 +11,7 @@ import (
 
 const ComputeTargetPoolAssetType string = "compute.googleapis.com/TargetPool"
 
-func resourceConverterComputeTargetPool() cai.ResourceConverter {
+func ResourceConverterComputeTargetPool() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ComputeTargetPoolAssetType,
 		Convert:   GetComputeTargetPoolCaiObject,

diff --git a/mmv1/third_party/tgc/container.go → ...party/tgc/services/container/container.go b/mmv1/third_party/tgc/container.go → ...party/tgc/services/container/container.go
@@ -4,7 +4,7 @@
 // see https://github.com/GoogleCloudPlatform/magic-modules/pull/2485#issuecomment-545680059
 // for the discussion.
 
-package google
+package container
 
 import (
 	"fmt"
@@ -19,14 +19,14 @@ import (
 const ContainerClusterAssetType string = "container.googleapis.com/Cluster"
 const ContainerNodePoolAssetType string = "container.googleapis.com/NodePool"
 
-func resourceConverterContainerCluster() cai.ResourceConverter {
+func ResourceConverterContainerCluster() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ContainerClusterAssetType,
 		Convert:   GetContainerClusterCaiObject,
 	}
 }
 
-func resourceConverterContainerNodePool() cai.ResourceConverter {
+func ResourceConverterContainerNodePool() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: ContainerNodePoolAssetType,
 		Convert:   GetContainerNodePoolCaiObject,

diff --git a/mmv1/third_party/tgc/job.go → .../third_party/tgc/services/dataflow/job.go b/mmv1/third_party/tgc/job.go → .../third_party/tgc/services/dataflow/job.go
@@ -1,4 +1,4 @@
-package google
+package dataflow
 
 import (
 	"reflect"
@@ -10,7 +10,7 @@ import (
 
 const DataflowJobAssetType string = "dataflow.googleapis.com/Job"
 
-func resourceDataflowJob() cai.ResourceConverter {
+func ResourceDataflowJob() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: DataflowJobAssetType,
 		Convert:   GetDataflowJobCaiObject,
@@ -302,4 +302,4 @@ func expandDataflowRuntimeUpdatableParams(v interface{}, d tpgresource.Terraform
 
 func expandDataflowSatisfiesPzi(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
-}
+}
diff --git a/mmv1/third_party/tgc/dataproc_cluster.go → ...tgc/services/dataproc/dataproc_cluster.go b/mmv1/third_party/tgc/dataproc_cluster.go → ...tgc/services/dataproc/dataproc_cluster.go
@@ -1,4 +1,4 @@
-package google
+package dataproc
 
 import (
 	"reflect"
@@ -11,7 +11,7 @@ import (
 
 const DataprocClusterAssetType string = "dataproc.googleapis.com/Cluster"
 
-func resourceConverterDataprocCluster() cai.ResourceConverter {
+func ResourceConverterDataprocCluster() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType: DataprocClusterAssetType,
 		Convert:   GetDataprocClusterCaiObject,

diff --git a/mmv1/third_party/tgc/kms_crypto_key_iam.go → ...ty/tgc/services/kms/kms_crypto_key_iam.go b/mmv1/third_party/tgc/kms_crypto_key_iam.go → ...ty/tgc/services/kms/kms_crypto_key_iam.go
@@ -1,4 +1,4 @@
-package google
+package kms
 
 import (
 	"fmt"
@@ -10,15 +10,15 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-func resourceConverterKmsCryptoKeyIamPolicy() cai.ResourceConverter {
+func ResourceConverterKmsCryptoKeyIamPolicy() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType:         "cloudkms.googleapis.com/CryptoKey",
 		Convert:           GetKmsCryptoKeyIamPolicyCaiObject,
 		MergeCreateUpdate: MergeKmsCryptoKeyIamPolicy,
 	}
 }
 
-func resourceConverterKmsCryptoKeyIamBinding() cai.ResourceConverter {
+func ResourceConverterKmsCryptoKeyIamBinding() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType:         "cloudkms.googleapis.com/CryptoKey",
 		Convert:           GetKmsCryptoKeyIamBindingCaiObject,
@@ -28,7 +28,7 @@ func resourceConverterKmsCryptoKeyIamBinding() cai.ResourceConverter {
 	}
 }
 
-func resourceConverterKmsCryptoKeyIamMember() cai.ResourceConverter {
+func ResourceConverterKmsCryptoKeyIamMember() cai.ResourceConverter {
 	return cai.ResourceConverter{
 		AssetType:         "cloudkms.googleapis.com/CryptoKey",
 		Convert:           GetKmsCryptoKeyIamMemberCaiObject,