Skip to content

Commit 5663208

Browse files
zli82016zli82016
authored
Update tgc v7 import references (#15222)
1 parent c92357c commit 5663208

File tree

116 files changed

+217
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+217
-213
lines changed

‎mmv1/provider/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Provider interface {
1717

1818
const TERRAFORM_PROVIDER_GA = "github.com/hashicorp/terraform-provider-google"
1919
const TERRAFORM_PROVIDER_BETA = "github.com/hashicorp/terraform-provider-google-beta"
20-
const TGC_PROVIDER = "github.com/GoogleCloudPlatform/terraform-google-conversion/v6"
20+
const TGC_PROVIDER = "github.com/GoogleCloudPlatform/terraform-google-conversion/v7"
2121
const RESOURCE_DIRECTORY_GA = "google"
2222
const RESOURCE_DIRECTORY_BETA = "google-beta"
2323
const RESOURCE_DIRECTORY_TGC = "pkg"

‎mmv1/templates/tgc/resource_converter.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"google.golang.org/api/bigtableadmin/v2"
3434
"google.golang.org/api/googleapi"
3535

36-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources/cai"
36+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/cai"
3737
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
3838
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
3939
"github.com/hashicorp/terraform-provider-google-beta/google-beta/verify"

‎mmv1/templates/tgc/resource_converter_iam.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package {{ lower $.ProductMetadata.Name }}
2222
import (
2323
"fmt"
2424

25-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources/cai"
25+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/cai"
2626
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
2727
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
2828
)

‎mmv1/templates/tgc_next/cai2hcl/resource_converter.go.tmpl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ import (
3333
"google.golang.org/api/bigtableadmin/v2"
3434
"google.golang.org/api/googleapi"
3535

36-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/cai2hcl/converters/utils"
37-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/cai2hcl/models"
38-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/caiasset"
39-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tgcresource"
40-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tpgresource"
41-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/transport"
42-
transport_tpg "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/transport"
43-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/verify"
36+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/cai2hcl/converters/utils"
37+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/cai2hcl/models"
38+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/caiasset"
39+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tgcresource"
40+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tpgresource"
41+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/transport"
42+
transport_tpg "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/transport"
43+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/verify"
4444
)
4545

4646
{{- $caiProductBaseUrl := $.CaiProductBaseUrl }}

‎mmv1/templates/tgc_next/cai2hcl/resource_converters.go.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
package converters
2929

3030
import (
31-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/cai2hcl/models"
31+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/cai2hcl/models"
3232
{{- range $service := $.Products }}
33-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/services/{{ lower $service.Name }}"
33+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/services/{{ lower $service.Name }}"
3434
{{- end }}
35-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/services/resourcemanager"
35+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/services/resourcemanager"
3636

3737
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
38-
tpg_provider "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/provider"
38+
tpg_provider "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/provider"
3939
)
4040

4141
var provider *schema.Provider = tpg_provider.Provider()

‎mmv1/templates/tgc_next/provider/provider_mmv1_resources.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
{{- range $object := $.ResourcesForVersion }}
77
"github.com/hashicorp/terraform-provider-google/google/services/{{ $object.ServiceName }}"
88
{{- end }}
9-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/services/resourcemanager"
9+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/services/resourcemanager"
1010
)
1111

1212
var handwrittenTfplan2caiResources = map[string]*schema.Resource{

‎mmv1/templates/tgc_next/services/resource.go.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
2222

2323
"github.com/apparentlymart/go-cidr/cidr"
24-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tgcresource"
25-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tpgresource"
26-
transport_tpg "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/transport"
27-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/verify"
24+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tgcresource"
25+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tpgresource"
26+
transport_tpg "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/transport"
27+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/verify"
2828
)
2929

3030
{{ if $.DefineAssetTypeForResourceInProduct -}}

‎mmv1/templates/tgc_next/test/test_file.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package {{$.PackageName}}_test
1717
import (
1818
"testing"
1919

20-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/test"
20+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/test"
2121
)
2222

2323
{{ range $e := $.TestExamples }}

‎mmv1/templates/tgc_next/tfplan2cai/resource_converter.go.tmpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ import (
3333
"google.golang.org/api/bigtableadmin/v2"
3434
"google.golang.org/api/googleapi"
3535

36-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/caiasset"
37-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tfplan2cai/converters/cai"
38-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tgcresource"
39-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tpgresource"
40-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/caiasset"
41-
transport_tpg "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/transport"
42-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/verify"
36+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/caiasset"
37+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tfplan2cai/converters/cai"
38+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tgcresource"
39+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tpgresource"
40+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/caiasset"
41+
transport_tpg "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/transport"
42+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/verify"
4343
)
4444

4545
{{- $caiProductBaseUrl := $.CaiProductBaseUrl }}

‎mmv1/templates/tgc_next/tfplan2cai/resource_converters.go.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
package converters
2929

3030
import (
31-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/tfplan2cai/converters/cai"
31+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tfplan2cai/converters/cai"
3232
{{- range $service := $.Products }}
33-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/services/{{ lower $service.Name }}"
33+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/services/{{ lower $service.Name }}"
3434
{{- end }}
35-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/pkg/services/resourcemanager"
35+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/services/resourcemanager"
3636
)
3737

3838
var ConverterMap = map[string]cai.Tfplan2caiConverter{

0 commit comments

Comments
 (0)