diff --git a/go.mod b/go.mod index dd2fa756d..06eecb957 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/hashicorp/terraform-json v0.14.0 github.com/hashicorp/terraform-plugin-framework v1.1.1 github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 - github.com/hashicorp/terraform-provider-google v1.20.1-0.20230405095146-b495ed16a910 + github.com/hashicorp/terraform-provider-google v1.20.1-0.20230405165724-9bea90defbc0 github.com/mitchellh/go-homedir v1.1.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 @@ -32,7 +32,6 @@ require ( require ( bitbucket.org/creachadair/stringset v0.0.8 // indirect cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/alloydb v0.2.0 // indirect cloud.google.com/go/compute v1.18.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v0.12.0 // indirect diff --git a/go.sum b/go.sum index b4f842cc2..7f61a6d01 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= -cloud.google.com/go/alloydb v0.2.0 h1:bAFRzwC4q/+eiz5FpckFbT0IZozJMTjVcrDdRCpIdJI= -cloud.google.com/go/alloydb v0.2.0/go.mod h1:wZv2QDg2+hJ/V4lXsUdnSm8ygdMKBVWeioAsERSBLbE= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -270,8 +268,8 @@ github.com/hashicorp/terraform-plugin-mux v0.8.0 h1:WCTP66mZ+iIaIrCNJnjPEYnVjawT github.com/hashicorp/terraform-plugin-mux v0.8.0/go.mod h1:vdW0daEi8Kd4RFJmet5Ot+SIVB/B8SwQVJiYKQwdCy8= github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0 h1:FtCLTiTcykdsURXPt/ku7fYXm3y19nbzbZcUxHx9RbI= github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0/go.mod h1:80wf5oad1tW+oLnbXS4UTYmDCrl7BuN1Q+IA91X1a4Y= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20230405095146-b495ed16a910 h1:qxvj3NLElUMPAH6zkVK2iViNWuqA4ayn4ZQ3EpU6PJ4= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20230405095146-b495ed16a910/go.mod h1:DLNZyxCBMAuTFiqYiitv+CH0v8C+OLMClalomSbsLsc= +github.com/hashicorp/terraform-provider-google v1.20.1-0.20230405165724-9bea90defbc0 h1:GiBp5v6GdYX08QJT0qLKMVrDgIVmmeVOZid3wVcOgM8= +github.com/hashicorp/terraform-provider-google v1.20.1-0.20230405165724-9bea90defbc0/go.mod h1:Wn+5oEyIb0xoRzKqjLIZ8DE7bvH9WQ68mAb3G8RJrcE= github.com/hashicorp/terraform-registry-address v0.1.0 h1:W6JkV9wbum+m516rCl5/NjKxCyTVaaUBbzYcMzBDO3U= github.com/hashicorp/terraform-registry-address v0.1.0/go.mod h1:EnyO2jYO6j29DTHbJcm00E5nQTFeTtyZH3H5ycydQ5A= github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0= diff --git a/tfplan2cai/converters/google/resources/bigqueryreservation_capacity_commitment.go b/tfplan2cai/converters/google/resources/bigqueryreservation_capacity_commitment.go index a3d3a639d..2bcc84703 100644 --- a/tfplan2cai/converters/google/resources/bigqueryreservation_capacity_commitment.go +++ b/tfplan2cai/converters/google/resources/bigqueryreservation_capacity_commitment.go @@ -26,7 +26,7 @@ func resourceConverterBigqueryReservationCapacityCommitment() ResourceConverter } func GetBigqueryReservationCapacityCommitmentCaiObject(d TerraformResourceData, config *Config) ([]Asset, error) { - name, err := assetName(d, config, "//bigqueryreservation.googleapis.com/{{name}}") + name, err := assetName(d, config, "//bigqueryreservation.googleapis.com/projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}") if err != nil { return []Asset{}, err }