Split tgc converters

GoogleCloudPlatform · Sep 28, 2024 · 00910be · 00910be
1 parent c0fae5c
commit 00910be
Show file tree

Hide file tree

Showing 49 changed files with 123 additions and 127 deletions.
diff --git a/mmv1/provider/terraform_tgc.go b/mmv1/provider/terraform_tgc.go
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"
@@ -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 {
@@ -238,7 +237,6 @@ func expandApikeysKeyMethods(v interface{}, d tpgresource.TerraformResourceData,
 	return 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"
@@ -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"

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"

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"

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"

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"

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"

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

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"

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"

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

diff --git a/mmv1/third_party/tgc/firebase_project.go → ...tgc/services/firebase/firebase_project.go b/mmv1/third_party/tgc/firebase_project.go → ...tgc/services/firebase/firebase_project.go
@@ -1,4 +1,4 @@
-package google
+package firebase
 
 import (
 	"reflect"
@@ -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/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"

diff --git a/mmv1/third_party/tgc/kms_key_ring_iam.go → ...arty/tgc/services/kms/kms_key_ring_iam.go b/mmv1/third_party/tgc/kms_key_ring_iam.go → ...arty/tgc/services/kms/kms_key_ring_iam.go
@@ -1,4 +1,4 @@
-package google
+package kms
 
 import (
 	"fmt"

diff --git a/.../logging_billing_account_bucket_config.go → .../logging_billing_account_bucket_config.go b/.../logging_billing_account_bucket_config.go → .../logging_billing_account_bucket_config.go
@@ -1,4 +1,4 @@
-package google
+package logging
 
 import (
 	"reflect"

diff --git a/...party/tgc/logging_folder_bucket_config.go → ...s/logging/logging_folder_bucket_config.go b/...party/tgc/logging_folder_bucket_config.go → ...s/logging/logging_folder_bucket_config.go
@@ -1,4 +1,4 @@
-package google
+package logging
 
 import (
 	"reflect"

diff --git a/...tgc/logging_organization_bucket_config.go → ...ing/logging_organization_bucket_config.go b/...tgc/logging_organization_bucket_config.go → ...ing/logging_organization_bucket_config.go
@@ -1,4 +1,4 @@
-package google
+package logging
 
 import (
 	"reflect"

diff --git a/...arty/tgc/logging_project_bucket_config.go → .../logging/logging_project_bucket_config.go b/...arty/tgc/logging_project_bucket_config.go → .../logging/logging_project_bucket_config.go
@@ -1,4 +1,4 @@
-package google
+package logging
 
 import (
 	"reflect"

diff --git a/.../third_party/tgc/monitoring_slo_helper.go → ...vices/monitoring/monitoring_slo_helper.go b/.../third_party/tgc/monitoring_slo_helper.go → ...vices/monitoring/monitoring_slo_helper.go
diff --git a/...hird_party/tgc/pubsub_subscription_iam.go → ...ervices/pubsub/pubsub_subscription_iam.go b/...hird_party/tgc/pubsub_subscription_iam.go → ...ervices/pubsub/pubsub_subscription_iam.go
diff --git a/mmv1/third_party/tgc/folder.go → ...ty/tgc/services/resourcemanager/folder.go b/mmv1/third_party/tgc/folder.go → ...ty/tgc/services/resourcemanager/folder.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"time"

diff --git a/mmv1/third_party/tgc/folder_iam.go → ...gc/services/resourcemanager/folder_iam.go b/mmv1/third_party/tgc/folder_iam.go → ...gc/services/resourcemanager/folder_iam.go
diff --git a/...d_party/tgc/folder_organization_policy.go → ...urcemanager/folder_organization_policy.go b/...d_party/tgc/folder_organization_policy.go → ...urcemanager/folder_organization_policy.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"

diff --git a/mmv1/third_party/tgc/org_policy_policy.go → ...ices/resourcemanager/org_policy_policy.go b/mmv1/third_party/tgc/org_policy_policy.go → ...ices/resourcemanager/org_policy_policy.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/organization_iam.go → ...vices/resourcemanager/organization_iam.go b/mmv1/third_party/tgc/organization_iam.go → ...vices/resourcemanager/organization_iam.go
diff --git a/...party/tgc/organization_iam_custom_role.go → ...cemanager/organization_iam_custom_role.go b/...party/tgc/organization_iam_custom_role.go → ...cemanager/organization_iam_custom_role.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"reflect"

diff --git a/mmv1/third_party/tgc/organization_policy.go → ...es/resourcemanager/organization_policy.go b/mmv1/third_party/tgc/organization_policy.go → ...es/resourcemanager/organization_policy.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"

diff --git a/mmv1/third_party/tgc/project.go → ...y/tgc/services/resourcemanager/project.go b/mmv1/third_party/tgc/project.go → ...y/tgc/services/resourcemanager/project.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/project_iam.go → ...c/services/resourcemanager/project_iam.go b/mmv1/third_party/tgc/project_iam.go → ...c/services/resourcemanager/project_iam.go
diff --git a/...hird_party/tgc/project_iam_custom_role.go → ...esourcemanager/project_iam_custom_role.go b/...hird_party/tgc/project_iam_custom_role.go → ...esourcemanager/project_iam_custom_role.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"reflect"

diff --git a/..._party/tgc/project_organization_policy.go → ...rcemanager/project_organization_policy.go b/..._party/tgc/project_organization_policy.go → ...rcemanager/project_organization_policy.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/project_service.go → ...rvices/resourcemanager/project_service.go b/mmv1/third_party/tgc/project_service.go → ...rvices/resourcemanager/project_service.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/project_service_test.go → ...s/resourcemanager/project_service_test.go b/mmv1/third_party/tgc/project_service_test.go → ...s/resourcemanager/project_service_test.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"testing"

diff --git a/mmv1/third_party/tgc/service_account.go → ...rvices/resourcemanager/service_account.go b/mmv1/third_party/tgc/service_account.go → ...rvices/resourcemanager/service_account.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/service_account_key.go → ...es/resourcemanager/service_account_key.go b/mmv1/third_party/tgc/service_account_key.go → ...es/resourcemanager/service_account_key.go
@@ -1,4 +1,4 @@
-package google
+package resourcemanager
 
 import (
 	"reflect"

diff --git a/mmv1/third_party/tgc/spanner_database_iam.go → .../services/spanner/spanner_database_iam.go b/mmv1/third_party/tgc/spanner_database_iam.go → .../services/spanner/spanner_database_iam.go
diff --git a/mmv1/third_party/tgc/spanner_instance_iam.go → .../services/spanner/spanner_instance_iam.go b/mmv1/third_party/tgc/spanner_instance_iam.go → .../services/spanner/spanner_instance_iam.go
diff --git a/.../third_party/tgc/sql_database_instance.go → ...tgc/services/sql/sql_database_instance.go b/.../third_party/tgc/sql_database_instance.go → ...tgc/services/sql/sql_database_instance.go
@@ -6,7 +6,7 @@
 //	third_party/terraform/resources/resource_sql_database_instance.go.erb.go
 //
 // ----------------------------------------------------------------------------
-package google
+package sql
 
 import (
 	"regexp"

diff --git a/mmv1/third_party/tgc/iam_storage_bucket.go → ...gc/services/storage/iam_storage_bucket.go b/mmv1/third_party/tgc/iam_storage_bucket.go → ...gc/services/storage/iam_storage_bucket.go
@@ -1,4 +1,4 @@
-package google
+package storage
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/storage_bucket.go → ...ty/tgc/services/storage/storage_bucket.go b/mmv1/third_party/tgc/storage_bucket.go → ...ty/tgc/services/storage/storage_bucket.go
@@ -6,7 +6,7 @@
 //	third_party/terraform/resources/resource_storage_bucket.go
 //
 // ----------------------------------------------------------------------------
-package google
+package storage
 
 import (
 	"fmt"

diff --git a/mmv1/third_party/tgc/storage_bucket_iam.go → ...gc/services/storage/storage_bucket_iam.go b/mmv1/third_party/tgc/storage_bucket_iam.go → ...gc/services/storage/storage_bucket_iam.go
@@ -1,4 +1,4 @@
-package google
+package storage
 
 import (
 	"fmt"