Skip to content

Commit 5f2e844

Browse files
zli82016zli82016
authored
chore: upgrade tgc module to v6 (#3495)
1 parent 3dcdd43 commit 5f2e844

File tree

702 files changed

+788
-788
lines changed

Some content is hidden

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

702 files changed

+788
-788
lines changed

‎cai2hcl/common/converter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package common
22

33
import (
4-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
4+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
55
"github.com/zclconf/go-cty/cty"
66
)
77

‎cai2hcl/convert.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package cai2hcl
33
import (
44
"fmt"
55

6-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
6+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
77

8-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
8+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
99
"go.uber.org/zap"
1010
)
1111

‎cai2hcl/convert_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cai2hcl_test
33
import (
44
"testing"
55

6-
cai2hclTesting "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hclTesting "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestConvertCompute(t *testing.T) {

‎cai2hcl/converter_map.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cai2hcl
22

33
import (
4-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
5-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/services/compute"
6-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/services/resourcemanager"
4+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
5+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/services/compute"
6+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/services/resourcemanager"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
tpg_provider "github.com/hashicorp/terraform-provider-google-beta/google-beta/provider"
99
)

‎cai2hcl/services/compute/compute_backend_service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"reflect"
88
"regexp"
99

10-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
11-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
10+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
11+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1313
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1414
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"

‎cai2hcl/services/compute/compute_backend_service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compute_test
33
import (
44
"testing"
55

6-
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestComputeBackendService(t *testing.T) {

‎cai2hcl/services/compute/compute_forwarding_rule.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"log"
77
"strings"
88

9-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
10-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
9+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
10+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1313
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"

‎cai2hcl/services/compute/compute_forwarding_rule_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compute_test
33
import (
44
"testing"
55

6-
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestComputeForwardingRule(t *testing.T) {

‎cai2hcl/services/compute/compute_instance.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"encoding/json"
55
"fmt"
66

7-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
7+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
88

9-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
9+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
"github.com/zclconf/go-cty/cty"
1212
"google.golang.org/api/compute/v1"

‎cai2hcl/services/compute/compute_instance_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compute_test
33
import (
44
"testing"
55

6-
cai2hclTesting "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hclTesting "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestComputeInstance(t *testing.T) {

‎cai2hcl/services/compute/compute_region_backend_service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"reflect"
77

8-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
9-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
8+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
9+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1212
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"

‎cai2hcl/services/compute/compute_region_backend_service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compute_test
33
import (
44
"testing"
55

6-
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestComputeRegionBackendService(t *testing.T) {

‎cai2hcl/services/compute/compute_region_health_check.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package compute
33
import (
44
"fmt"
55

6-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
7-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
6+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
7+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1010
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"

‎cai2hcl/services/compute/compute_region_health_check_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compute_test
33
import (
44
"testing"
55

6-
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hcl_testing "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestComputeRegionHealthCheck(t *testing.T) {

‎cai2hcl/services/resourcemanager/project.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/common"
9-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
8+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/common"
9+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
1010

1111
tfschema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
"github.com/zclconf/go-cty/cty"

‎cai2hcl/services/resourcemanager/project_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package resourcemanager_test
33
import (
44
"testing"
55

6-
cai2hclTesting "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl/testing"
6+
cai2hclTesting "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl/testing"
77
)
88

99
func TestComputeInstance(t *testing.T) {

‎cai2hcl/testing/assert_test_files.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77
"testing"
88

9-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/cai2hcl"
10-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
9+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/cai2hcl"
10+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
1111
"go.uber.org/zap"
1212

1313
"github.com/google/go-cmp/cmp"

‎cmd/tfplan2cai/convert.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"os"
2222

23-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
24-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai"
23+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
24+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai"
2525
"github.com/pkg/errors"
2626
"github.com/spf13/cobra"
2727
"go.uber.org/zap"

‎cmd/tfplan2cai/convert_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"path"
88
"testing"
99

10-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
10+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
1111

1212
"github.com/stretchr/testify/assert"
1313
"go.uber.org/zap"

‎cmd/tfplan2cai/list_supported_resources.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"text/tabwriter"
2323

24-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
24+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
2525
"github.com/spf13/cobra"
2626
)
2727

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/GoogleCloudPlatform/terraform-google-conversion/v5
1+
module github.com/GoogleCloudPlatform/terraform-google-conversion/v6
22

33
go 1.23
44

‎tfplan2cai/ancestrymanager/ancestrymanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
crmv3 "google.golang.org/api/cloudresourcemanager/v3"
1212
"google.golang.org/api/storage/v1"
1313

14-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
14+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
1515
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1616
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
1717

‎tfplan2cai/ancestrymanager/ancestrymanager_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"testing"
1111

12-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
13-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/tfdata"
12+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
13+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/tfdata"
1414
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1515
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
1616

‎tfplan2cai/ancestrymanager/ancestryutil.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
7+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
88
"github.com/hashicorp/errwrap"
99
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
1010
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"

‎tfplan2cai/ancestrymanager/ancestryutil_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ancestrymanager
33
import (
44
"testing"
55

6-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
6+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
77
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
88
)
99

‎tfplan2cai/converters/google/convert.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
26-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/ancestrymanager"
27-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
28-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/tfdata"
29-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/tfplan"
25+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
26+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/ancestrymanager"
27+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
28+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/tfdata"
29+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/tfplan"
3030
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
3131
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
3232

‎tfplan2cai/converters/google/convert_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/caiasset"
13-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/ancestrymanager"
14-
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources"
15-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"
16-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/services/resourcemanager"
17-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/tfdata"
12+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/caiasset"
13+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/ancestrymanager"
14+
resources "github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources"
15+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources/cai"
16+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources/services/resourcemanager"
17+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/tfdata"
1818
"github.com/google/go-cmp/cmp"
1919
tfjson "github.com/hashicorp/terraform-json"
2020
provider "github.com/hashicorp/terraform-provider-google-beta/google-beta/provider"

‎tfplan2cai/converters/google/resources/cai.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package google
22

33
import (
4-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"
4+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources/cai"
55
"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
66
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
77
)

‎tfplan2cai/converters/google/resources/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package google
22

33
import (
4-
"github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai"
4+
"github.com/GoogleCloudPlatform/terraform-google-conversion/v6/tfplan2cai/converters/google/resources/cai"
55
transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
66
)
77

0 commit comments

Comments
 (0)