Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tgc provider split #11864

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tgc provider split #11864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
150 changes: 75 additions & 75 deletions mmv1/provider/terraform_tgc.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions mmv1/third_party/tgc/apikeys_key.go → ...party/tgc/services/apikeys/apikeys_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package apikeys

import (
"reflect"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
4 changes: 1 addition & 3 deletions .../third_party/tgc/appengine_application.go → ...rvices/appengine/appengine_application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package appengine

import (
"reflect"
Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion ...d_party/tgc/appengine_standard_version.go → ...s/appengine/appengine_standard_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package appengine

import (
"reflect"
Expand Down
0 mmv1/third_party/tgc/bigquery_dataset_iam.go → ...services/bigquery/bigquery_dataset_iam.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/bigquery_table.go → ...y/tgc/services/bigquery/bigquery_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package bigquery

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/bigtable_cluster.go → ...tgc/services/bigtable/bigtable_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package bigtable

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/bigtable_instance.go → ...gc/services/bigtable/bigtable_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package bigtable

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion ...arty/tgc/cloudfunctions_cloud_function.go → ...unctions/cloudfunctions_cloud_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package cloudfunctions

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion ...hird_party/tgc/cloudfunctions_function.go → ...cloudfunctions/cloudfunctions_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package cloudfunctions

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/composer_environment.go → ...services/composer/composer_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package composer

import (
"reflect"
Expand Down
8 changes: 4 additions & 4 deletions mmv1/third_party/tgc/commitment.go → ..._party/tgc/services/compute/commitment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package compute

import (
"reflect"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}
0 .../third_party/tgc/compute_instance.go.tmpl → ...services/compute/compute_instance.go.tmpl
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...third_party/tgc/compute_instance_group.go → ...ervices/compute/compute_instance_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package compute

import (
"reflect"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion ...hird_party/tgc/compute_security_policy.go → ...rvices/compute/compute_security_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package compute

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/compute_target_pool.go → ...c/services/compute/compute_target_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package compute

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/container.go → ...party/tgc/services/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// see https://github.com/GoogleCloudPlatform/magic-modules/pull/2485#issuecomment-545680059
// for the discussion.

package google
package container

import (
"fmt"
Expand Down
4 changes: 2 additions & 2 deletions mmv1/third_party/tgc/job.go → .../third_party/tgc/services/dataflow/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package dataflow

import (
"reflect"
Expand Down Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/dataproc_cluster.go → ...tgc/services/dataproc/dataproc_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package dataproc

import (
"reflect"
Expand Down
6 changes: 3 additions & 3 deletions mmv1/third_party/tgc/firebase_project.go → ...tgc/services/firebase/firebase_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package firebase

import (
"reflect"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/kms_crypto_key_iam.go → ...ty/tgc/services/kms/kms_crypto_key_iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package kms

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/kms_key_ring_iam.go → ...arty/tgc/services/kms/kms_key_ring_iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package kms

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion .../logging_billing_account_bucket_config.go → .../logging_billing_account_bucket_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package logging

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion ...party/tgc/logging_folder_bucket_config.go → ...s/logging/logging_folder_bucket_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package logging

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion ...tgc/logging_organization_bucket_config.go → ...ing/logging_organization_bucket_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package logging

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion ...arty/tgc/logging_project_bucket_config.go → .../logging/logging_project_bucket_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package logging

import (
"reflect"
Expand Down
0 .../third_party/tgc/monitoring_slo_helper.go → ...vices/monitoring/monitoring_slo_helper.go
View file
Open in desktop
File renamed without changes.
0 ...hird_party/tgc/pubsub_subscription_iam.go → ...ervices/pubsub/pubsub_subscription_iam.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/folder.go → ...ty/tgc/services/resourcemanager/folder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"time"
Expand Down
0 mmv1/third_party/tgc/folder_iam.go → ...gc/services/resourcemanager/folder_iam.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...d_party/tgc/folder_organization_policy.go → ...urcemanager/folder_organization_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/org_policy_policy.go → ...ices/resourcemanager/org_policy_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"fmt"
Expand Down
0 mmv1/third_party/tgc/organization_iam.go → ...vices/resourcemanager/organization_iam.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...party/tgc/organization_iam_custom_role.go → ...cemanager/organization_iam_custom_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/organization_policy.go → ...es/resourcemanager/organization_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/project.go → ...y/tgc/services/resourcemanager/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"fmt"
Expand Down
0 mmv1/third_party/tgc/project_iam.go → ...c/services/resourcemanager/project_iam.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...hird_party/tgc/project_iam_custom_role.go → ...esourcemanager/project_iam_custom_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion ..._party/tgc/project_organization_policy.go → ...rcemanager/project_organization_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/project_service.go → ...rvices/resourcemanager/project_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/project_service_test.go → ...s/resourcemanager/project_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/service_account.go → ...rvices/resourcemanager/service_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/service_account_key.go → ...es/resourcemanager/service_account_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package resourcemanager

import (
"reflect"
Expand Down
0 mmv1/third_party/tgc/spanner_database_iam.go → .../services/spanner/spanner_database_iam.go
View file
Open in desktop
File renamed without changes.
0 mmv1/third_party/tgc/spanner_instance_iam.go → .../services/spanner/spanner_instance_iam.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../third_party/tgc/sql_database_instance.go → ...tgc/services/sql/sql_database_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// third_party/terraform/resources/resource_sql_database_instance.go.erb.go
//
// ----------------------------------------------------------------------------
package google
package sql

import (
"regexp"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/iam_storage_bucket.go → ...gc/services/storage/iam_storage_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package storage

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/storage_bucket.go → ...ty/tgc/services/storage/storage_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// third_party/terraform/resources/resource_storage_bucket.go
//
// ----------------------------------------------------------------------------
package google
package storage

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/tgc/storage_bucket_iam.go → ...gc/services/storage/storage_bucket_iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package google
package storage

import (
"fmt"
Expand Down