diff --git a/.changelog/10339.txt b/.changelog/10339.txt new file mode 100644 index 0000000000..42b910df15 --- /dev/null +++ b/.changelog/10339.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` \ No newline at end of file diff --git a/go.mod b/go.mod index 554a78a220..611bc7e32f 100644 --- a/go.mod +++ b/go.mod @@ -18,10 +18,11 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/terraform-plugin-framework v1.7.0 github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 - github.com/hashicorp/terraform-plugin-go v0.22.1 + github.com/hashicorp/terraform-plugin-go v0.23.0 github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.15.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 + github.com/hashicorp/terraform-plugin-testing v1.5.1 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/hashstructure v1.1.0 github.com/sirupsen/logrus v1.8.1 @@ -43,7 +44,7 @@ require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.8 // indirect cloud.google.com/go/longrunning v0.5.7 // indirect - github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect + github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect @@ -67,14 +68,14 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.4 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-plugin v1.6.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/hashicorp/hc-install v0.6.3 // indirect - github.com/hashicorp/hcl/v2 v2.19.1 // indirect + github.com/hashicorp/hc-install v0.6.4 // indirect + github.com/hashicorp/hcl/v2 v2.20.1 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.20.0 // indirect - github.com/hashicorp/terraform-json v0.21.0 // indirect + github.com/hashicorp/terraform-exec v0.21.0 // indirect + github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/hashicorp/terraform-registry-address v0.2.3 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.1.1 // indirect @@ -91,7 +92,7 @@ require ( github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/zclconf/go-cty v1.14.2 // indirect + github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect @@ -104,6 +105,7 @@ require ( golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect diff --git a/go.sum b/go.sum index 04ec71650c..4912869c1b 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,8 @@ github.com/GoogleCloudPlatform/declarative-resource-client-library v1.68.0 h1:LI github.com/GoogleCloudPlatform/declarative-resource-client-library v1.68.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE9N5vPhgY2I+j0= -github.com/ProtonMail/go-crypto v1.1.0-alpha.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg= +github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= @@ -77,8 +77,8 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66D github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= -github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= -github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -146,8 +146,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= @@ -157,28 +157,30 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/C github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.6.3 h1:yE/r1yJvWbtrJ0STwScgEnCanb0U9v7zp0Gbkmcoxqs= -github.com/hashicorp/hc-install v0.6.3/go.mod h1:KamGdbodYzlufbWh4r9NRo8y6GLHWZP2GBtdnms1Ln0= -github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= -github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hc-install v0.6.4 h1:QLqlM56/+SIIGvGcfFiwMY3z5WGXT066suo/v9Km8e0= +github.com/hashicorp/hc-install v0.6.4/go.mod h1:05LWLy8TD842OtgcfBbOT0WMoInBMUSHjmDx10zuBIA= +github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc= +github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8JyYF3vpnuEo= -github.com/hashicorp/terraform-exec v0.20.0/go.mod h1:ckKGkJWbsNqFKV1itgMnE0hY9IYf1HoiekpuN0eWoDw= -github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U= -github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk= +github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= +github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= +github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= +github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A= github.com/hashicorp/terraform-plugin-framework v1.7.0 h1:wOULbVmfONnJo9iq7/q+iBOBJul5vRovaYJIu2cY/Pw= github.com/hashicorp/terraform-plugin-framework v1.7.0/go.mod h1:jY9Id+3KbZ17OMpulgnWLSfwxNVYSoYBQFTgsx044CI= github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 h1:LYz4bXh3t7bTEydXOmPDPupRRnA480B/9+jV8yZvxBA= github.com/hashicorp/terraform-plugin-framework-validators v0.9.0/go.mod h1:+BVERsnfdlhYR2YkXMBtPnmn9UsL19U3qUtSZ+Y/5MY= -github.com/hashicorp/terraform-plugin-go v0.22.1 h1:iTS7WHNVrn7uhe3cojtvWWn83cm2Z6ryIUDTRO0EV7w= -github.com/hashicorp/terraform-plugin-go v0.22.1/go.mod h1:qrjnqRghvQ6KnDbB12XeZ4FluclYwptntoWCr9QaXTI= +github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co= +github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ= github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0= github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow= github.com/hashicorp/terraform-plugin-mux v0.15.0 h1:+/+lDx0WUsIOpkAmdwBIoFU8UP9o2eZASoOnLsWbKME= github.com/hashicorp/terraform-plugin-mux v0.15.0/go.mod h1:9ezplb1Dyq394zQ+ldB0nvy/qbNAz3mMoHHseMTMaKo= github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8= github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A= +github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c= +github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0= github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= @@ -237,13 +239,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= -github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= +github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -268,8 +270,10 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.14.2 h1:kTG7lqmBou0Zkx35r6HJHUQTvaRPr5bIAf3AoHS0izI= -github.com/zclconf/go-cty v1.14.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= +github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= diff --git a/google-beta/acctest/framework_test_utils.go b/google-beta/acctest/framework_test_utils.go index 2e83d86126..3bd578ab48 100644 --- a/google-beta/acctest/framework_test_utils.go +++ b/google-beta/acctest/framework_test_utils.go @@ -4,14 +4,10 @@ package acctest import ( "context" - "fmt" "log" "testing" "github.com/hashicorp/terraform-plugin-framework/diag" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func GetFwTestProvider(t *testing.T) *frameworkTestProvider { @@ -31,47 +27,3 @@ func GetFwTestProvider(t *testing.T) *frameworkTestProvider { return p } - -// General test utils - -// TestExtractResourceAttr navigates a test's state to find the specified resource (or data source) attribute and makes the value -// accessible via the attributeValue string pointer. -func TestExtractResourceAttr(resourceName string, attributeName string, attributeValue *string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] // To find a datasource, include `data.` at the start of the resourceName value - - if !ok { - return fmt.Errorf("resource name %s not found in state", resourceName) - } - - attrValue, ok := rs.Primary.Attributes[attributeName] - - if !ok { - return fmt.Errorf("attribute %s not found in resource %s state", attributeName, resourceName) - } - - *attributeValue = attrValue - - return nil - } -} - -// TestCheckAttributeValuesEqual compares two string pointers, which have been used to retrieve attribute values from the test's state. -func TestCheckAttributeValuesEqual(i *string, j *string) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testStringValue(i) != testStringValue(j) { - return fmt.Errorf("attribute values are different, got %s and %s", testStringValue(i), testStringValue(j)) - } - - return nil - } -} - -// testStringValue returns string values from string pointers, handling nil pointers. -func testStringValue(sPtr *string) string { - if sPtr == nil { - return "" - } - - return *sPtr -} diff --git a/google-beta/acctest/provider_test_utils.go b/google-beta/acctest/provider_test_utils.go index 85b17da53a..3e6db1dd33 100644 --- a/google-beta/acctest/provider_test_utils.go +++ b/google-beta/acctest/provider_test_utils.go @@ -4,18 +4,15 @@ package acctest import ( "context" - "fmt" "io/ioutil" "os" "strings" "testing" - "time" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/provider" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) @@ -104,41 +101,3 @@ func AccTestPreCheck_AdcCredentialsOnly(t *testing.T) { t.Fatalf("One of %s must be set for acceptance tests", strings.Join(envvar.ZoneEnvVars, ", ")) } } - -// GetTestRegion has the same logic as the provider's GetRegion, to be used in tests. -func GetTestRegion(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { - if res, ok := is.Attributes["region"]; ok { - return res, nil - } - if config.Region != "" { - return config.Region, nil - } - return "", fmt.Errorf("%q: required field is not set", "region") -} - -// GetTestProject has the same logic as the provider's GetProject, to be used in tests. -func GetTestProject(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { - if res, ok := is.Attributes["project"]; ok { - return res, nil - } - if config.Project != "" { - return config.Project, nil - } - return "", fmt.Errorf("%q: required field is not set", "project") -} - -// Some tests fail during VCR. One common case is race conditions when creating resources. -// If a test config adds two fine-grained resources with the same parent it is undefined -// which will be created first, causing VCR to fail ~50% of the time -func SkipIfVcr(t *testing.T) { - if IsVcrEnabled() { - t.Skipf("VCR enabled, skipping test: %s", t.Name()) - } -} - -func SleepInSecondsForTest(t int) resource.TestCheckFunc { - return func(s *terraform.State) error { - time.Sleep(time.Duration(t) * time.Second) - return nil - } -} diff --git a/google-beta/acctest/resource_test_utils.go b/google-beta/acctest/resource_test_utils.go new file mode 100644 index 0000000000..20454f2ca8 --- /dev/null +++ b/google-beta/acctest/resource_test_utils.go @@ -0,0 +1,95 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 +package acctest + +import ( + "fmt" + "testing" + "time" + + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" +) + +// General test utils + +// TestExtractResourceAttr navigates a test's state to find the specified resource (or data source) attribute and makes the value +// accessible via the attributeValue string pointer. +func TestExtractResourceAttr(resourceName string, attributeName string, attributeValue *string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] // To find a datasource, include `data.` at the start of the resourceName value + + if !ok { + return fmt.Errorf("resource name %s not found in state", resourceName) + } + + attrValue, ok := rs.Primary.Attributes[attributeName] + + if !ok { + return fmt.Errorf("attribute %s not found in resource %s state", attributeName, resourceName) + } + + *attributeValue = attrValue + + return nil + } +} + +// GetTestRegion has the same logic as the provider's GetRegion, to be used in tests. +func GetTestRegion(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { + if res, ok := is.Attributes["region"]; ok { + return res, nil + } + if config.Region != "" { + return config.Region, nil + } + return "", fmt.Errorf("%q: required field is not set", "region") +} + +// GetTestProject has the same logic as the provider's GetProject, to be used in tests. +func GetTestProject(is *terraform.InstanceState, config *transport_tpg.Config) (string, error) { + if res, ok := is.Attributes["project"]; ok { + return res, nil + } + if config.Project != "" { + return config.Project, nil + } + return "", fmt.Errorf("%q: required field is not set", "project") +} + +// Some tests fail during VCR. One common case is race conditions when creating resources. +// If a test config adds two fine-grained resources with the same parent it is undefined +// which will be created first, causing VCR to fail ~50% of the time +func SkipIfVcr(t *testing.T) { + if IsVcrEnabled() { + t.Skipf("VCR enabled, skipping test: %s", t.Name()) + } +} + +func SleepInSecondsForTest(t int) resource.TestCheckFunc { + return func(s *terraform.State) error { + time.Sleep(time.Duration(t) * time.Second) + return nil + } +} + +// TestCheckAttributeValuesEqual compares two string pointers, which have been used to retrieve attribute values from the test's state. +func TestCheckAttributeValuesEqual(i *string, j *string) resource.TestCheckFunc { + return func(s *terraform.State) error { + if testStringValue(i) != testStringValue(j) { + return fmt.Errorf("attribute values are different, got %s and %s", testStringValue(i), testStringValue(j)) + } + + return nil + } +} + +// testStringValue returns string values from string pointers, handling nil pointers. +func testStringValue(sPtr *string) string { + if sPtr == nil { + return "" + } + + return *sPtr +} diff --git a/google-beta/acctest/test_utils.go b/google-beta/acctest/test_utils.go index d078fef37c..fba03cfb97 100644 --- a/google-beta/acctest/test_utils.go +++ b/google-beta/acctest/test_utils.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/providerserver" "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/acctest/vcr_utils.go b/google-beta/acctest/vcr_utils.go index c9ac86085c..555e165d00 100644 --- a/google-beta/acctest/vcr_utils.go +++ b/google-beta/acctest/vcr_utils.go @@ -38,8 +38,8 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func IsVcrEnabled() bool { diff --git a/google-beta/functions/location_from_id_test.go b/google-beta/functions/location_from_id_test.go index 31cd05ccdf..e4c7525ab4 100644 --- a/google-beta/functions/location_from_id_test.go +++ b/google-beta/functions/location_from_id_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/functions/name_from_id_test.go b/google-beta/functions/name_from_id_test.go index e0cbb06d7a..dac2dbb7de 100644 --- a/google-beta/functions/name_from_id_test.go +++ b/google-beta/functions/name_from_id_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/functions/project_from_id_test.go b/google-beta/functions/project_from_id_test.go index 43a7a16bb9..a58258039b 100644 --- a/google-beta/functions/project_from_id_test.go +++ b/google-beta/functions/project_from_id_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/functions/region_from_id_test.go b/google-beta/functions/region_from_id_test.go index 4896cf4715..b26726ac4e 100644 --- a/google-beta/functions/region_from_id_test.go +++ b/google-beta/functions/region_from_id_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/functions/region_from_zone_test.go b/google-beta/functions/region_from_zone_test.go index 406ef57c34..e077349f04 100644 --- a/google-beta/functions/region_from_zone_test.go +++ b/google-beta/functions/region_from_zone_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/functions/zone_from_id_test.go b/google-beta/functions/zone_from_id_test.go index 8d620b4cc0..37a08f1604 100644 --- a/google-beta/functions/zone_from_id_test.go +++ b/google-beta/functions/zone_from_id_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/fwprovider/framework_provider_test.go b/google-beta/fwprovider/framework_provider_test.go index f55237707a..fdfb0e43fb 100644 --- a/google-beta/fwprovider/framework_provider_test.go +++ b/google-beta/fwprovider/framework_provider_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/fwresource" diff --git a/google-beta/fwresource/field_helpers.go b/google-beta/fwresource/field_helpers.go index 2d8476eac5..5c11c17143 100644 --- a/google-beta/fwresource/field_helpers.go +++ b/google-beta/fwresource/field_helpers.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/fwtransport" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/provider/provider_test.go b/google-beta/provider/provider_test.go index 2c33e7bae6..f9713e9193 100644 --- a/google-beta/provider/provider_test.go +++ b/google-beta/provider/provider_test.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestProvider(t *testing.T) { diff --git a/google-beta/provider/universe/universe_domain_compute_test.go b/google-beta/provider/universe/universe_domain_compute_test.go index 29cd779531..37058bc058 100644 --- a/google-beta/provider/universe/universe_domain_compute_test.go +++ b/google-beta/provider/universe/universe_domain_compute_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/provider/universe/universe_domain_pubsub_test.go b/google-beta/provider/universe/universe_domain_pubsub_test.go index 0cf250c7ab..d12bdf3bfc 100644 --- a/google-beta/provider/universe/universe_domain_pubsub_test.go +++ b/google-beta/provider/universe/universe_domain_pubsub_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/provider/universe/universe_domain_storage_test.go b/google-beta/provider/universe/universe_domain_storage_test.go index 886b49de37..d4e44b1987 100644 --- a/google-beta/provider/universe/universe_domain_storage_test.go +++ b/google-beta/provider/universe/universe_domain_storage_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/accessapproval/data_source_access_approval_folder_service_account_test.go b/google-beta/services/accessapproval/data_source_access_approval_folder_service_account_test.go index 783bf25211..c58f55b025 100644 --- a/google-beta/services/accessapproval/data_source_access_approval_folder_service_account_test.go +++ b/google-beta/services/accessapproval/data_source_access_approval_folder_service_account_test.go @@ -5,7 +5,7 @@ package accessapproval_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/accessapproval/data_source_access_approval_organization_service_account_test.go b/google-beta/services/accessapproval/data_source_access_approval_organization_service_account_test.go index f7c9aa373b..3c2a47a116 100644 --- a/google-beta/services/accessapproval/data_source_access_approval_organization_service_account_test.go +++ b/google-beta/services/accessapproval/data_source_access_approval_organization_service_account_test.go @@ -5,7 +5,7 @@ package accessapproval_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/accessapproval/data_source_access_approval_project_service_account_test.go b/google-beta/services/accessapproval/data_source_access_approval_project_service_account_test.go index 6e1eaad26a..2de71d9355 100644 --- a/google-beta/services/accessapproval/data_source_access_approval_project_service_account_test.go +++ b/google-beta/services/accessapproval/data_source_access_approval_project_service_account_test.go @@ -5,7 +5,7 @@ package accessapproval_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/accessapproval/resource_access_approval_folder_settings_test.go b/google-beta/services/accessapproval/resource_access_approval_folder_settings_test.go index ac63ddc132..6156576a86 100644 --- a/google-beta/services/accessapproval/resource_access_approval_folder_settings_test.go +++ b/google-beta/services/accessapproval/resource_access_approval_folder_settings_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Since access approval settings are hierarchical, and only one can exist per folder/project/org, diff --git a/google-beta/services/accessapproval/resource_access_approval_organization_settings_test.go b/google-beta/services/accessapproval/resource_access_approval_organization_settings_test.go index 636f3aa6c4..c2a2f2eef7 100644 --- a/google-beta/services/accessapproval/resource_access_approval_organization_settings_test.go +++ b/google-beta/services/accessapproval/resource_access_approval_organization_settings_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Since access approval settings are hierarchical, and only one can exist per folder/project/org, diff --git a/google-beta/services/accessapproval/resource_access_approval_project_settings_test.go b/google-beta/services/accessapproval/resource_access_approval_project_settings_test.go index 9927914edb..cc3f604071 100644 --- a/google-beta/services/accessapproval/resource_access_approval_project_settings_test.go +++ b/google-beta/services/accessapproval/resource_access_approval_project_settings_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Since access approval settings are hierarchical, and only one can exist per folder/project/org, diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go index b0c91c4c34..81d30ec1a3 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_condition_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_test.go index 2b8623351f..9a02f8a513 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_level_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go index dc1d7e4e19..4fe0485d8c 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_levels_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go index 4f03623037..b564c7515b 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go index c7321704c1..b189d47e4b 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go index fec4c0c92c..ca29948025 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go index eaf60d5065..d35e714db0 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go index 32c488e6c4..aee072ee76 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go index 6d75a7b0e1..b8fd81a478 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go index 2df3aaf058..2eb5ea0965 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go index efdc2b0e9f..5640301d17 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go index 699ad71844..1bfdd48a7a 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go index 9a644a0f0e..0b5c152bc9 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/activedirectory/resource_active_directory_domain_trust_test.go b/google-beta/services/activedirectory/resource_active_directory_domain_trust_test.go index 59f0abc451..d092c5d713 100644 --- a/google-beta/services/activedirectory/resource_active_directory_domain_trust_test.go +++ b/google-beta/services/activedirectory/resource_active_directory_domain_trust_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/activedirectory/resource_active_directory_domain_update_test.go b/google-beta/services/activedirectory/resource_active_directory_domain_update_test.go index dbc75981ce..81348aa4c3 100644 --- a/google-beta/services/activedirectory/resource_active_directory_domain_update_test.go +++ b/google-beta/services/activedirectory/resource_active_directory_domain_update_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/alloydb/data_source_alloydb_locations_test.go b/google-beta/services/alloydb/data_source_alloydb_locations_test.go index b58f8824cc..f990f05e87 100644 --- a/google-beta/services/alloydb/data_source_alloydb_locations_test.go +++ b/google-beta/services/alloydb/data_source_alloydb_locations_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/data_source_alloydb_supported_database_flags_test.go b/google-beta/services/alloydb/data_source_alloydb_supported_database_flags_test.go index 21d8a8c126..6fcba23284 100644 --- a/google-beta/services/alloydb/data_source_alloydb_supported_database_flags_test.go +++ b/google-beta/services/alloydb/data_source_alloydb_supported_database_flags_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go b/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go index 74af3b880e..8ec93c7e2e 100644 --- a/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/alloydb/resource_alloydb_backup_test.go b/google-beta/services/alloydb/resource_alloydb_backup_test.go index 1ff209e465..b0db476ebf 100644 --- a/google-beta/services/alloydb/resource_alloydb_backup_test.go +++ b/google-beta/services/alloydb/resource_alloydb_backup_test.go @@ -5,7 +5,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go b/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go index b402655c44..84b42e8570 100644 --- a/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/alloydb/resource_alloydb_cluster_restore_test.go b/google-beta/services/alloydb/resource_alloydb_cluster_restore_test.go index 3fa25fc32f..c8c5347930 100644 --- a/google-beta/services/alloydb/resource_alloydb_cluster_restore_test.go +++ b/google-beta/services/alloydb/resource_alloydb_cluster_restore_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_cluster_test.go b/google-beta/services/alloydb/resource_alloydb_cluster_test.go index fe6677e193..929ea9c7b7 100644 --- a/google-beta/services/alloydb/resource_alloydb_cluster_test.go +++ b/google-beta/services/alloydb/resource_alloydb_cluster_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go b/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go index 68d79e4d5f..3bd1b01bee 100644 --- a/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/alloydb/resource_alloydb_instance_test.go b/google-beta/services/alloydb/resource_alloydb_instance_test.go index 2a5ab6728d..2d691c8985 100644 --- a/google-beta/services/alloydb/resource_alloydb_instance_test.go +++ b/google-beta/services/alloydb/resource_alloydb_instance_test.go @@ -5,7 +5,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_secondary_cluster_test.go b/google-beta/services/alloydb/resource_alloydb_secondary_cluster_test.go index 9c263f72c7..a939454678 100644 --- a/google-beta/services/alloydb/resource_alloydb_secondary_cluster_test.go +++ b/google-beta/services/alloydb/resource_alloydb_secondary_cluster_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_secondary_instance_test.go b/google-beta/services/alloydb/resource_alloydb_secondary_instance_test.go index 0e23e79641..b47717dbd1 100644 --- a/google-beta/services/alloydb/resource_alloydb_secondary_instance_test.go +++ b/google-beta/services/alloydb/resource_alloydb_secondary_instance_test.go @@ -5,7 +5,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/alloydb/resource_alloydb_user_generated_test.go b/google-beta/services/alloydb/resource_alloydb_user_generated_test.go index a214e3d250..cea8fc510e 100644 --- a/google-beta/services/alloydb/resource_alloydb_user_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_user_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/alloydb/resource_alloydb_user_test.go b/google-beta/services/alloydb/resource_alloydb_user_test.go index 5e024c82ca..f2c4d9bda7 100644 --- a/google-beta/services/alloydb/resource_alloydb_user_test.go +++ b/google-beta/services/alloydb/resource_alloydb_user_test.go @@ -5,7 +5,7 @@ package alloydb_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/apigateway/iam_api_gateway_api_config_generated_test.go b/google-beta/services/apigateway/iam_api_gateway_api_config_generated_test.go index c253a3081f..3992f41f1e 100644 --- a/google-beta/services/apigateway/iam_api_gateway_api_config_generated_test.go +++ b/google-beta/services/apigateway/iam_api_gateway_api_config_generated_test.go @@ -20,7 +20,7 @@ package apigateway_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/apigateway/iam_api_gateway_api_generated_test.go b/google-beta/services/apigateway/iam_api_gateway_api_generated_test.go index 9a30ee48f4..fd76224bc1 100644 --- a/google-beta/services/apigateway/iam_api_gateway_api_generated_test.go +++ b/google-beta/services/apigateway/iam_api_gateway_api_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigateway/iam_api_gateway_gateway_generated_test.go b/google-beta/services/apigateway/iam_api_gateway_gateway_generated_test.go index 3169773db0..d1afd7772d 100644 --- a/google-beta/services/apigateway/iam_api_gateway_gateway_generated_test.go +++ b/google-beta/services/apigateway/iam_api_gateway_gateway_generated_test.go @@ -20,7 +20,7 @@ package apigateway_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go b/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go index 1b1fbb9df1..119ae968fa 100644 --- a/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/apigateway/resource_api_gateway_api_config_test.go b/google-beta/services/apigateway/resource_api_gateway_api_config_test.go index 1f2f6f0cd6..43e2366da7 100644 --- a/google-beta/services/apigateway/resource_api_gateway_api_config_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_api_config_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayApiConfig_apigatewayApiConfigBasicExampleUpdated(t *testing.T) { diff --git a/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go b/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go index 8e4dc69042..49aff91a79 100644 --- a/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/apigateway/resource_api_gateway_api_test.go b/google-beta/services/apigateway/resource_api_gateway_api_test.go index f1bc8cf008..a747543d3c 100644 --- a/google-beta/services/apigateway/resource_api_gateway_api_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_api_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayApi_apigatewayApiBasicExampleUpdated(t *testing.T) { diff --git a/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go b/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go index 2e30411c9c..1b25cc7e02 100644 --- a/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/apigateway/resource_api_gateway_gateway_test.go b/google-beta/services/apigateway/resource_api_gateway_gateway_test.go index 5f0d925cfb..dde5b20141 100644 --- a/google-beta/services/apigateway/resource_api_gateway_gateway_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_gateway_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated(t *testing.T) { diff --git a/google-beta/services/apigee/iam_apigee_environment_generated_test.go b/google-beta/services/apigee/iam_apigee_environment_generated_test.go index 0542732d51..d9b76e1485 100644 --- a/google-beta/services/apigee/iam_apigee_environment_generated_test.go +++ b/google-beta/services/apigee/iam_apigee_environment_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go b/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go index 7d5438c64d..9c9cbfd54b 100644 --- a/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_endpoint_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_endpoint_attachment_generated_test.go index e367684a41..09c6085ca6 100644 --- a/google-beta/services/apigee/resource_apigee_endpoint_attachment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_endpoint_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go b/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go index 4423ca6f64..da7b55766b 100644 --- a/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go +++ b/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go b/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go index 8bf907ca42..4856afd362 100644 --- a/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_env_references_generated_test.go b/google-beta/services/apigee/resource_apigee_env_references_generated_test.go index ef299f030c..dea81b3562 100644 --- a/google-beta/services/apigee/resource_apigee_env_references_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_env_references_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go index 457b76c3c4..5798007e69 100644 --- a/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go b/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go index 51e32fccb4..af8ab63a0a 100644 --- a/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_environment_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_generated_test.go index 50b247d590..7be94ce89f 100644 --- a/google-beta/services/apigee/resource_apigee_environment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go index c3059ded89..dbc3a03319 100644 --- a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go index e84c8039f7..b02e6d0499 100644 --- a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_environment_type_test.go b/google-beta/services/apigee/resource_apigee_environment_type_test.go index eed65099df..adabb48222 100644 --- a/google-beta/services/apigee/resource_apigee_environment_type_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_type_test.go @@ -5,7 +5,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/apigee/resource_apigee_flowhook_test.go b/google-beta/services/apigee/resource_apigee_flowhook_test.go index 942fcae99a..039b35a1ab 100644 --- a/google-beta/services/apigee/resource_apigee_flowhook_test.go +++ b/google-beta/services/apigee/resource_apigee_flowhook_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go index d6f24ff511..4bb9edc675 100644 --- a/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_instance_generated_test.go b/google-beta/services/apigee/resource_apigee_instance_generated_test.go index 8837a42e6f..1173430c3f 100644 --- a/google-beta/services/apigee/resource_apigee_instance_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go index 75069b7b5e..dbcab3b87f 100644 --- a/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go +++ b/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go index eb708cfd27..feeeaca0e5 100644 --- a/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go b/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go index d34218fcef..5d6dab84e6 100644 --- a/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_organization_generated_test.go b/google-beta/services/apigee/resource_apigee_organization_generated_test.go index d556c5ad45..30a5ab0ad1 100644 --- a/google-beta/services/apigee/resource_apigee_organization_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_organization_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_sharedflow_deployment_test.go b/google-beta/services/apigee/resource_apigee_sharedflow_deployment_test.go index 3162c2b06e..f43fb78827 100644 --- a/google-beta/services/apigee/resource_apigee_sharedflow_deployment_test.go +++ b/google-beta/services/apigee/resource_apigee_sharedflow_deployment_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccApigeeSharedflowDeployment_apigeeSharedflowDeploymentTestExample(t *testing.T) { diff --git a/google-beta/services/apigee/resource_apigee_sharedflow_test.go b/google-beta/services/apigee/resource_apigee_sharedflow_test.go index 0e037f74dd..d218dc4980 100644 --- a/google-beta/services/apigee/resource_apigee_sharedflow_test.go +++ b/google-beta/services/apigee/resource_apigee_sharedflow_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go b/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go index 098a5e06d0..07330f75c3 100644 --- a/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go @@ -20,7 +20,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_sync_authorization_test.go b/google-beta/services/apigee/resource_apigee_sync_authorization_test.go index b5b2378109..dd584857b3 100644 --- a/google-beta/services/apigee/resource_apigee_sync_authorization_test.go +++ b/google-beta/services/apigee/resource_apigee_sync_authorization_test.go @@ -5,7 +5,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/apigee/resource_apigee_target_server_generated_test.go b/google-beta/services/apigee/resource_apigee_target_server_generated_test.go index e71f410e69..950e3cd4c8 100644 --- a/google-beta/services/apigee/resource_apigee_target_server_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_target_server_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apigee/resource_apigee_target_server_test.go b/google-beta/services/apigee/resource_apigee_target_server_test.go index 921e7e24df..55f4b2245f 100644 --- a/google-beta/services/apigee/resource_apigee_target_server_test.go +++ b/google-beta/services/apigee/resource_apigee_target_server_test.go @@ -5,7 +5,7 @@ package apigee_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apikeys/resource_apikeys_key_generated_test.go b/google-beta/services/apikeys/resource_apikeys_key_generated_test.go index 8a651a61d8..1a59e99d62 100644 --- a/google-beta/services/apikeys/resource_apikeys_key_generated_test.go +++ b/google-beta/services/apikeys/resource_apikeys_key_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" apikeys "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/apikeys/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/appengine/data_source_google_app_engine_default_service_account_test.go b/google-beta/services/appengine/data_source_google_app_engine_default_service_account_test.go index 4dec124d6c..a3bbc9fe88 100644 --- a/google-beta/services/appengine/data_source_google_app_engine_default_service_account_test.go +++ b/google-beta/services/appengine/data_source_google_app_engine_default_service_account_test.go @@ -5,7 +5,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/appengine/resource_app_engine_application_test.go b/google-beta/services/appengine/resource_app_engine_application_test.go index 7e7bf884c6..66f0cc5101 100644 --- a/google-beta/services/appengine/resource_app_engine_application_test.go +++ b/google-beta/services/appengine/resource_app_engine_application_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go b/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go index c348b59e65..7ca5e73af4 100644 --- a/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go b/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go index 886afe1348..643ca0176c 100644 --- a/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/appengine/resource_app_engine_domain_mapping_test.go b/google-beta/services/appengine/resource_app_engine_domain_mapping_test.go index 1a213006c4..11335f7b95 100644 --- a/google-beta/services/appengine/resource_app_engine_domain_mapping_test.go +++ b/google-beta/services/appengine/resource_app_engine_domain_mapping_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go b/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go index 0769d41fff..174138620e 100644 --- a/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/appengine/resource_app_engine_flexible_app_version_generated_test.go b/google-beta/services/appengine/resource_app_engine_flexible_app_version_generated_test.go index 1145892c2c..7d40eb1b2e 100644 --- a/google-beta/services/appengine/resource_app_engine_flexible_app_version_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_flexible_app_version_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/appengine/resource_app_engine_flexible_app_version_test.go b/google-beta/services/appengine/resource_app_engine_flexible_app_version_test.go index f00fb0c518..b948a76149 100644 --- a/google-beta/services/appengine/resource_app_engine_flexible_app_version_test.go +++ b/google-beta/services/appengine/resource_app_engine_flexible_app_version_test.go @@ -5,7 +5,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go b/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go index e5ceb1486d..105012779a 100644 --- a/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go @@ -20,7 +20,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/appengine/resource_app_engine_service_network_settings_test.go b/google-beta/services/appengine/resource_app_engine_service_network_settings_test.go index 7fa759782d..6fdd0a7580 100644 --- a/google-beta/services/appengine/resource_app_engine_service_network_settings_test.go +++ b/google-beta/services/appengine/resource_app_engine_service_network_settings_test.go @@ -5,7 +5,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go b/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go index 55d26e74de..be67cf3e4c 100644 --- a/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go @@ -20,7 +20,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go b/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go index 2a8614163a..54007f938c 100644 --- a/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/appengine/resource_app_engine_standard_app_version_test.go b/google-beta/services/appengine/resource_app_engine_standard_app_version_test.go index d2ecdbc134..45a86383c3 100644 --- a/google-beta/services/appengine/resource_app_engine_standard_app_version_test.go +++ b/google-beta/services/appengine/resource_app_engine_standard_app_version_test.go @@ -5,7 +5,7 @@ package appengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/apphub/data_source_apphub_application_test.go b/google-beta/services/apphub/data_source_apphub_application_test.go index 3a4469ed06..b71ea6f8be 100644 --- a/google-beta/services/apphub/data_source_apphub_application_test.go +++ b/google-beta/services/apphub/data_source_apphub_application_test.go @@ -5,7 +5,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/apphub/data_source_apphub_discovered_service_test.go b/google-beta/services/apphub/data_source_apphub_discovered_service_test.go index 7785e80357..cc8b999223 100644 --- a/google-beta/services/apphub/data_source_apphub_discovered_service_test.go +++ b/google-beta/services/apphub/data_source_apphub_discovered_service_test.go @@ -5,7 +5,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/apphub/data_source_apphub_discovered_workload_test.go b/google-beta/services/apphub/data_source_apphub_discovered_workload_test.go index 0db10cf1b0..9a3c2d1d38 100644 --- a/google-beta/services/apphub/data_source_apphub_discovered_workload_test.go +++ b/google-beta/services/apphub/data_source_apphub_discovered_workload_test.go @@ -5,7 +5,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/apphub/resource_apphub_application_generated_test.go b/google-beta/services/apphub/resource_apphub_application_generated_test.go index 33ec6c0973..d8faa9114e 100644 --- a/google-beta/services/apphub/resource_apphub_application_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_application_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/apphub/resource_apphub_application_test.go b/google-beta/services/apphub/resource_apphub_application_test.go index 79bcdc294d..14c5e31457 100644 --- a/google-beta/services/apphub/resource_apphub_application_test.go +++ b/google-beta/services/apphub/resource_apphub_application_test.go @@ -5,7 +5,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/apphub/resource_apphub_service_generated_test.go b/google-beta/services/apphub/resource_apphub_service_generated_test.go index c0d9e88735..e9da328f2f 100644 --- a/google-beta/services/apphub/resource_apphub_service_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go b/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go index d50eb279a3..07f9f11b3e 100644 --- a/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apphub/resource_apphub_service_test.go b/google-beta/services/apphub/resource_apphub_service_test.go index bafb881c1c..42b0c1faec 100644 --- a/google-beta/services/apphub/resource_apphub_service_test.go +++ b/google-beta/services/apphub/resource_apphub_service_test.go @@ -5,7 +5,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apphub/resource_apphub_workload_generated_test.go b/google-beta/services/apphub/resource_apphub_workload_generated_test.go index 3f8ce28b73..d836d5893e 100644 --- a/google-beta/services/apphub/resource_apphub_workload_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_workload_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/apphub/resource_apphub_workload_test.go b/google-beta/services/apphub/resource_apphub_workload_test.go index ba62ea69b1..351092d55e 100644 --- a/google-beta/services/apphub/resource_apphub_workload_test.go +++ b/google-beta/services/apphub/resource_apphub_workload_test.go @@ -5,7 +5,7 @@ package apphub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/artifactregistry/data_source_artifact_registry_docker_image_test.go b/google-beta/services/artifactregistry/data_source_artifact_registry_docker_image_test.go index eb47d1b222..bca157984e 100644 --- a/google-beta/services/artifactregistry/data_source_artifact_registry_docker_image_test.go +++ b/google-beta/services/artifactregistry/data_source_artifact_registry_docker_image_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/artifactregistry/data_source_artifact_registry_repository_test.go b/google-beta/services/artifactregistry/data_source_artifact_registry_repository_test.go index 81b4d9f1da..79acd3b203 100644 --- a/google-beta/services/artifactregistry/data_source_artifact_registry_repository_test.go +++ b/google-beta/services/artifactregistry/data_source_artifact_registry_repository_test.go @@ -5,7 +5,7 @@ package artifactregistry_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/artifactregistry/iam_artifact_registry_repository_generated_test.go b/google-beta/services/artifactregistry/iam_artifact_registry_repository_generated_test.go index d4b3f65395..3593594793 100644 --- a/google-beta/services/artifactregistry/iam_artifact_registry_repository_generated_test.go +++ b/google-beta/services/artifactregistry/iam_artifact_registry_repository_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go b/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go index f06db76bc0..26bf2b6173 100644 --- a/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go +++ b/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/artifactregistry/resource_artifact_registry_repository_test.go b/google-beta/services/artifactregistry/resource_artifact_registry_repository_test.go index ffeb08228a..0f7e08e577 100644 --- a/google-beta/services/artifactregistry/resource_artifact_registry_repository_test.go +++ b/google-beta/services/artifactregistry/resource_artifact_registry_repository_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccArtifactRegistryRepository_update(t *testing.T) { diff --git a/google-beta/services/assuredworkloads/resource_assured_workloads_workload_generated_test.go b/google-beta/services/assuredworkloads/resource_assured_workloads_workload_generated_test.go index 6e965e44d3..4a0b225170 100644 --- a/google-beta/services/assuredworkloads/resource_assured_workloads_workload_generated_test.go +++ b/google-beta/services/assuredworkloads/resource_assured_workloads_workload_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" assuredworkloads "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/assuredworkloads/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/backupdr/data_source_backup_dr_management_server_test.go b/google-beta/services/backupdr/data_source_backup_dr_management_server_test.go index 39bed36676..3a65f2edf5 100644 --- a/google-beta/services/backupdr/data_source_backup_dr_management_server_test.go +++ b/google-beta/services/backupdr/data_source_backup_dr_management_server_test.go @@ -4,8 +4,8 @@ package backupdr_test import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go b/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go index c4874c0571..809b1a35e1 100644 --- a/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go +++ b/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go @@ -3,7 +3,7 @@ package beyondcorp_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" diff --git a/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go b/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go index 246465a372..1826e51d4c 100644 --- a/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go +++ b/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go @@ -5,7 +5,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go b/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go index 7bacb57a2c..fd5d77644c 100644 --- a/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go +++ b/google-beta/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go @@ -5,7 +5,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go index 08f7f4cfc4..9f6e0dc84d 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_test.go index c412fa6a1d..e8a86b5e93 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_test.go @@ -5,7 +5,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go index e855a7e21e..cdaa86a682 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_test.go index bbd62b7551..679766f902 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_test.go @@ -5,7 +5,7 @@ package beyondcorp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go index 4636e19f70..76ecaabd92 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/biglake/resource_biglake_catalog_generated_test.go b/google-beta/services/biglake/resource_biglake_catalog_generated_test.go index 7b21b548ab..85a9b96523 100644 --- a/google-beta/services/biglake/resource_biglake_catalog_generated_test.go +++ b/google-beta/services/biglake/resource_biglake_catalog_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/biglake/resource_biglake_database_generated_test.go b/google-beta/services/biglake/resource_biglake_database_generated_test.go index 7f5626d5a1..6ef40f524e 100644 --- a/google-beta/services/biglake/resource_biglake_database_generated_test.go +++ b/google-beta/services/biglake/resource_biglake_database_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/biglake/resource_biglake_database_test.go b/google-beta/services/biglake/resource_biglake_database_test.go index c1ccf6e047..f127520ef0 100644 --- a/google-beta/services/biglake/resource_biglake_database_test.go +++ b/google-beta/services/biglake/resource_biglake_database_test.go @@ -5,7 +5,7 @@ package biglake_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/biglake/resource_biglake_table_generated_test.go b/google-beta/services/biglake/resource_biglake_table_generated_test.go index 65eeaa3413..f8d22b025d 100644 --- a/google-beta/services/biglake/resource_biglake_table_generated_test.go +++ b/google-beta/services/biglake/resource_biglake_table_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/biglake/resource_biglake_table_test.go b/google-beta/services/biglake/resource_biglake_table_test.go index e129e718ab..90d5a1a125 100644 --- a/google-beta/services/biglake/resource_biglake_table_test.go +++ b/google-beta/services/biglake/resource_biglake_table_test.go @@ -5,7 +5,7 @@ package biglake_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigquery/data_source_google_bigquery_dataset_test.go b/google-beta/services/bigquery/data_source_google_bigquery_dataset_test.go index 834a601443..202d4e15b1 100644 --- a/google-beta/services/bigquery/data_source_google_bigquery_dataset_test.go +++ b/google-beta/services/bigquery/data_source_google_bigquery_dataset_test.go @@ -7,7 +7,7 @@ package bigquery_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigquery/data_source_google_bigquery_default_service_account_test.go b/google-beta/services/bigquery/data_source_google_bigquery_default_service_account_test.go index b6e3a60073..67d817c745 100644 --- a/google-beta/services/bigquery/data_source_google_bigquery_default_service_account_test.go +++ b/google-beta/services/bigquery/data_source_google_bigquery_default_service_account_test.go @@ -5,7 +5,7 @@ package bigquery_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigquery/iam_bigquery_table_generated_test.go b/google-beta/services/bigquery/iam_bigquery_table_generated_test.go index a57cb3d2ab..544e4f2991 100644 --- a/google-beta/services/bigquery/iam_bigquery_table_generated_test.go +++ b/google-beta/services/bigquery/iam_bigquery_table_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigquery/resource_bigquery_dataset_access_test.go b/google-beta/services/bigquery/resource_bigquery_dataset_access_test.go index e21fbf8bb6..4878fc2e08 100644 --- a/google-beta/services/bigquery/resource_bigquery_dataset_access_test.go +++ b/google-beta/services/bigquery/resource_bigquery_dataset_access_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go b/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go index 09c0e5d3d0..4baa2fed0f 100644 --- a/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigquery/resource_bigquery_dataset_iam_member_test.go b/google-beta/services/bigquery/resource_bigquery_dataset_iam_member_test.go index 0798070233..f9df8b51b9 100644 --- a/google-beta/services/bigquery/resource_bigquery_dataset_iam_member_test.go +++ b/google-beta/services/bigquery/resource_bigquery_dataset_iam_member_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/bigquery/resource_bigquery_dataset_iam_test.go b/google-beta/services/bigquery/resource_bigquery_dataset_iam_test.go index 5eadde7d93..c9eeee2d6f 100644 --- a/google-beta/services/bigquery/resource_bigquery_dataset_iam_test.go +++ b/google-beta/services/bigquery/resource_bigquery_dataset_iam_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/bigquery/resource_bigquery_dataset_test.go b/google-beta/services/bigquery/resource_bigquery_dataset_test.go index f5b30b9926..af920d8c6c 100644 --- a/google-beta/services/bigquery/resource_bigquery_dataset_test.go +++ b/google-beta/services/bigquery/resource_bigquery_dataset_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "google.golang.org/api/bigquery/v2" diff --git a/google-beta/services/bigquery/resource_bigquery_job_generated_test.go b/google-beta/services/bigquery/resource_bigquery_job_generated_test.go index 3c9478acf4..1320fabcb2 100644 --- a/google-beta/services/bigquery/resource_bigquery_job_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_job_generated_test.go @@ -20,7 +20,7 @@ package bigquery_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigquery/resource_bigquery_job_test.go b/google-beta/services/bigquery/resource_bigquery_job_test.go index 47f7800e15..e71216acd3 100644 --- a/google-beta/services/bigquery/resource_bigquery_job_test.go +++ b/google-beta/services/bigquery/resource_bigquery_job_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go b/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go index fc8db87f79..70cdcdc775 100644 --- a/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigquery/resource_bigquery_routine_test.go b/google-beta/services/bigquery/resource_bigquery_routine_test.go index 382a285a09..7d30fb26e1 100644 --- a/google-beta/services/bigquery/resource_bigquery_routine_test.go +++ b/google-beta/services/bigquery/resource_bigquery_routine_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigquery/resource_bigquery_table_test.go b/google-beta/services/bigquery/resource_bigquery_table_test.go index aece952eae..2f5ba084db 100644 --- a/google-beta/services/bigquery/resource_bigquery_table_test.go +++ b/google-beta/services/bigquery/resource_bigquery_table_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_data_exchange_generated_test.go b/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_data_exchange_generated_test.go index 369d55a15f..e7e5403808 100644 --- a/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_data_exchange_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_data_exchange_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_listing_generated_test.go b/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_listing_generated_test.go index 0a9a02a3a7..58dd85b7b6 100644 --- a/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_listing_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/iam_bigquery_analytics_hub_listing_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go index de99729580..12a5a71b82 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go index 87f7932b31..691bd12279 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go index fd4813b22a..95e052281b 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go @@ -5,7 +5,7 @@ package bigqueryanalyticshub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigqueryconnection/iam_bigquery_connection_generated_test.go b/google-beta/services/bigqueryconnection/iam_bigquery_connection_generated_test.go index 3867ed1108..f1593b8f84 100644 --- a/google-beta/services/bigqueryconnection/iam_bigquery_connection_generated_test.go +++ b/google-beta/services/bigqueryconnection/iam_bigquery_connection_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go b/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go index 29968c5b86..a756bf7e31 100644 --- a/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go +++ b/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigqueryconnection/resource_bigquery_connection_test.go b/google-beta/services/bigqueryconnection/resource_bigquery_connection_test.go index ebac8a83cf..19b7cf3633 100644 --- a/google-beta/services/bigqueryconnection/resource_bigquery_connection_test.go +++ b/google-beta/services/bigqueryconnection/resource_bigquery_connection_test.go @@ -5,7 +5,7 @@ package bigqueryconnection_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigquerydatapolicy/iam_bigquery_datapolicy_data_policy_generated_test.go b/google-beta/services/bigquerydatapolicy/iam_bigquery_datapolicy_data_policy_generated_test.go index 02e0d3fc7c..b258f71d32 100644 --- a/google-beta/services/bigquerydatapolicy/iam_bigquery_datapolicy_data_policy_generated_test.go +++ b/google-beta/services/bigquerydatapolicy/iam_bigquery_datapolicy_data_policy_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go b/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go index f7e4800625..b372f23aaf 100644 --- a/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go +++ b/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go b/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go index 042e827ef7..c02f952993 100644 --- a/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go +++ b/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_test.go @@ -5,7 +5,7 @@ package bigquerydatapolicy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go b/google-beta/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go index 2c2c644f33..d7c5a949de 100644 --- a/google-beta/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go +++ b/google-beta/services/bigquerydatatransfer/resource_bigquery_data_transfer_config_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquerydatatransfer" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go index 91513b80f8..b7c27a0821 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go index 55f78ae49c..b24dd731a7 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_test.go @@ -5,7 +5,7 @@ package bigqueryreservation_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go index ad42ee555c..bc7cf5d091 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go index bfd7dff302..5eeefda063 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go index 9cd744300f..3a7df46fe7 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go b/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go index c464b7fced..c9cf210c64 100644 --- a/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go +++ b/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/bigtable/resource_bigtable_app_profile_test.go b/google-beta/services/bigtable/resource_bigtable_app_profile_test.go index 9eaf3de1ba..79f99d535e 100644 --- a/google-beta/services/bigtable/resource_bigtable_app_profile_test.go +++ b/google-beta/services/bigtable/resource_bigtable_app_profile_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/bigtable/resource_bigtable_authorized_view_test.go b/google-beta/services/bigtable/resource_bigtable_authorized_view_test.go index 83644f6730..2041594dd5 100644 --- a/google-beta/services/bigtable/resource_bigtable_authorized_view_test.go +++ b/google-beta/services/bigtable/resource_bigtable_authorized_view_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBigtableAuthorizedView_basic(t *testing.T) { diff --git a/google-beta/services/bigtable/resource_bigtable_gc_policy_test.go b/google-beta/services/bigtable/resource_bigtable_gc_policy_test.go index ae8da3ece5..17b1dbe461 100644 --- a/google-beta/services/bigtable/resource_bigtable_gc_policy_test.go +++ b/google-beta/services/bigtable/resource_bigtable_gc_policy_test.go @@ -10,8 +10,8 @@ import ( "time" "cloud.google.com/go/bigtable" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" tpgbigtable "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable" ) diff --git a/google-beta/services/bigtable/resource_bigtable_instance_iam_test.go b/google-beta/services/bigtable/resource_bigtable_instance_iam_test.go index e119d3d6b6..a3385a4fcb 100644 --- a/google-beta/services/bigtable/resource_bigtable_instance_iam_test.go +++ b/google-beta/services/bigtable/resource_bigtable_instance_iam_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/bigtable/resource_bigtable_instance_test.go b/google-beta/services/bigtable/resource_bigtable_instance_test.go index 138c33cf94..9a16aa92cd 100644 --- a/google-beta/services/bigtable/resource_bigtable_instance_test.go +++ b/google-beta/services/bigtable/resource_bigtable_instance_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBigtableInstance_basic(t *testing.T) { diff --git a/google-beta/services/bigtable/resource_bigtable_table_iam_test.go b/google-beta/services/bigtable/resource_bigtable_table_iam_test.go index 2040e7e65e..e9c54ed7ca 100644 --- a/google-beta/services/bigtable/resource_bigtable_table_iam_test.go +++ b/google-beta/services/bigtable/resource_bigtable_table_iam_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/bigtable/resource_bigtable_table_test.go b/google-beta/services/bigtable/resource_bigtable_table_test.go index c6ce45b668..f5ddc634a0 100644 --- a/google-beta/services/bigtable/resource_bigtable_table_test.go +++ b/google-beta/services/bigtable/resource_bigtable_table_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBigtableTable_basic(t *testing.T) { diff --git a/google-beta/services/billing/data_source_google_billing_account_test.go b/google-beta/services/billing/data_source_google_billing_account_test.go index 7ca824f3be..c5e190187b 100644 --- a/google-beta/services/billing/data_source_google_billing_account_test.go +++ b/google-beta/services/billing/data_source_google_billing_account_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/billing/iam_billing_account_test.go b/google-beta/services/billing/iam_billing_account_test.go index 0b73ac7efc..50fb6a2a0f 100644 --- a/google-beta/services/billing/iam_billing_account_test.go +++ b/google-beta/services/billing/iam_billing_account_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBillingAccountIam(t *testing.T) { diff --git a/google-beta/services/billing/resource_billing_budget_generated_test.go b/google-beta/services/billing/resource_billing_budget_generated_test.go index b01cca748a..9ce2161d2d 100644 --- a/google-beta/services/billing/resource_billing_budget_generated_test.go +++ b/google-beta/services/billing/resource_billing_budget_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/billing/resource_billing_budget_test.go b/google-beta/services/billing/resource_billing_budget_test.go index ab86fa5200..406975c4bb 100644 --- a/google-beta/services/billing/resource_billing_budget_test.go +++ b/google-beta/services/billing/resource_billing_budget_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/billing" diff --git a/google-beta/services/binaryauthorization/iam_binary_authorization_attestor_generated_test.go b/google-beta/services/binaryauthorization/iam_binary_authorization_attestor_generated_test.go index d5d5fb5fff..8be94e8d9d 100644 --- a/google-beta/services/binaryauthorization/iam_binary_authorization_attestor_generated_test.go +++ b/google-beta/services/binaryauthorization/iam_binary_authorization_attestor_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go b/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go index 9e78aa51ea..123e1a16de 100644 --- a/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go +++ b/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_test.go b/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_test.go index df85e35937..245c6a932c 100644 --- a/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_test.go +++ b/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_test.go @@ -4,7 +4,7 @@ package binaryauthorization_test import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/binaryauthorization" "testing" diff --git a/google-beta/services/binaryauthorization/resource_binary_authorization_policy_test.go b/google-beta/services/binaryauthorization/resource_binary_authorization_policy_test.go index 900e0f860c..595776524d 100644 --- a/google-beta/services/binaryauthorization/resource_binary_authorization_policy_test.go +++ b/google-beta/services/binaryauthorization/resource_binary_authorization_policy_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go b/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go index 1ae716ea09..2226bdc86b 100644 --- a/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go +++ b/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go b/google-beta/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go index cf96373730..25f7afcb75 100644 --- a/google-beta/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go +++ b/google-beta/services/certificatemanager/data_source_google_certificate_manager_certificate_map_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go index ee0dc19874..157a13715b 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go index eb427abed4..40c83dc9c2 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go index db44a46e77..868d71a532 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go index 571f990358..c57b6220f9 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go index 9e21c4c702..5550407fdc 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_upgrade_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go index 3b05452e77..b2fb478804 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go index abac31b40f..6050736ff3 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_test.go @@ -5,7 +5,7 @@ package certificatemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go index 58b07152ef..62ed21334f 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_upgrade_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go index 65d98aebc3..db151e4706 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_test.go index bddcf2982c..479834a0b4 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_test.go @@ -5,7 +5,7 @@ package certificatemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go b/google-beta/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go index 966e542bfc..15df9508ce 100644 --- a/google-beta/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go +++ b/google-beta/services/cloudasset/data_source_google_cloud_asset_resources_search_all_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go b/google-beta/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go index 6b219f18e6..b14b5a8175 100644 --- a/google-beta/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go +++ b/google-beta/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go b/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go index 64d949cc39..842419c010 100644 --- a/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go +++ b/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go b/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go index 6bda76d2cc..959f36904a 100644 --- a/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go +++ b/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go b/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go index eeaecc52d7..e5949a8d5a 100644 --- a/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go +++ b/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go b/google-beta/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go index 7adba56e39..dcf59c446f 100644 --- a/google-beta/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go +++ b/google-beta/services/cloudbuild/data_source_google_cloudbuild_trigger_test.go @@ -5,7 +5,7 @@ package cloudbuild_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go index 87aa7a997f..6814402f31 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go index 2791e0c1c8..707b1768d1 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go index e8b3b171d7..2c47feeb0a 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudBuildTrigger_basic(t *testing.T) { diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go index 3b8dc75459..40dbccdb72 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_upgrade_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_worker_pool_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_worker_pool_test.go index d2960be58f..fbba97db98 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_worker_pool_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_worker_pool_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudbuildv2/iam_cloudbuildv2_connection_generated_test.go b/google-beta/services/cloudbuildv2/iam_cloudbuildv2_connection_generated_test.go index cb011e30cb..4f7ea45f21 100644 --- a/google-beta/services/cloudbuildv2/iam_cloudbuildv2_connection_generated_test.go +++ b/google-beta/services/cloudbuildv2/iam_cloudbuildv2_connection_generated_test.go @@ -20,7 +20,7 @@ package cloudbuildv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go index 45ff5a7ae3..b5927b5a48 100644 --- a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go +++ b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go index d614aefbbc..170833fed3 100644 --- a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go +++ b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_test.go @@ -5,7 +5,7 @@ package cloudbuildv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go index 205b2f8595..d350b16c1a 100644 --- a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go +++ b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/clouddeploy/iam_clouddeploy_custom_target_type_generated_test.go b/google-beta/services/clouddeploy/iam_clouddeploy_custom_target_type_generated_test.go index 7cdab327b7..36bb5b9773 100644 --- a/google-beta/services/clouddeploy/iam_clouddeploy_custom_target_type_generated_test.go +++ b/google-beta/services/clouddeploy/iam_clouddeploy_custom_target_type_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/clouddeploy/iam_clouddeploy_delivery_pipeline_generated_test.go b/google-beta/services/clouddeploy/iam_clouddeploy_delivery_pipeline_generated_test.go index 1effd3ecea..cbe1c99065 100644 --- a/google-beta/services/clouddeploy/iam_clouddeploy_delivery_pipeline_generated_test.go +++ b/google-beta/services/clouddeploy/iam_clouddeploy_delivery_pipeline_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/clouddeploy/iam_clouddeploy_target_generated_test.go b/google-beta/services/clouddeploy/iam_clouddeploy_target_generated_test.go index 527e47f700..ceb5aed3f0 100644 --- a/google-beta/services/clouddeploy/iam_clouddeploy_target_generated_test.go +++ b/google-beta/services/clouddeploy/iam_clouddeploy_target_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go index b7dcd63b20..df66c1b84b 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_automation_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_automation_test.go index 160525703e..e98e84c7cc 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_automation_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_automation_test.go @@ -5,7 +5,7 @@ package clouddeploy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go index 6b219fcf40..eba2d4d70e 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go index 0ee3efa442..1a908f585a 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_test.go @@ -5,7 +5,7 @@ package clouddeploy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_delivery_pipeline_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_delivery_pipeline_generated_test.go index 9fbc800db7..02a1f2fe8e 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_delivery_pipeline_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_delivery_pipeline_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" clouddeploy "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/clouddeploy/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_target_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_target_generated_test.go index ed84dc439d..151393b269 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_target_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_target_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" clouddeploy "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/clouddeploy/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_target_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_target_test.go index 789dcc6178..c67f4126f3 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_target_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_target_test.go @@ -5,7 +5,7 @@ package clouddeploy_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go b/google-beta/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go index 42f213c043..63dbc45b59 100644 --- a/google-beta/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go +++ b/google-beta/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleCloudFunctionsFunction_basic(t *testing.T) { diff --git a/google-beta/services/cloudfunctions/iam_cloudfunctions_function_generated_test.go b/google-beta/services/cloudfunctions/iam_cloudfunctions_function_generated_test.go index c416e6766d..1d7056367b 100644 --- a/google-beta/services/cloudfunctions/iam_cloudfunctions_function_generated_test.go +++ b/google-beta/services/cloudfunctions/iam_cloudfunctions_function_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go b/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go index b7c151077b..e70207ec86 100644 --- a/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go +++ b/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcloudfunctions "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudfunctions" diff --git a/google-beta/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go b/google-beta/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go index 1e7679f4e6..7edd0c6e66 100644 --- a/google-beta/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go +++ b/google-beta/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudfunctions2/iam_cloudfunctions2_function_generated_test.go b/google-beta/services/cloudfunctions2/iam_cloudfunctions2_function_generated_test.go index 6ebd63c169..f240a08ca0 100644 --- a/google-beta/services/cloudfunctions2/iam_cloudfunctions2_function_generated_test.go +++ b/google-beta/services/cloudfunctions2/iam_cloudfunctions2_function_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go index 8f83bb2297..d39c118b2b 100644 --- a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go +++ b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go index 4f197829c8..d7c4eb6eea 100644 --- a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go +++ b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go @@ -5,7 +5,7 @@ package cloudfunctions2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go b/google-beta/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go index 9e57803c4b..55808c15af 100644 --- a/google-beta/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go +++ b/google-beta/services/cloudidentity/data_source_cloud_identity_group_lookup_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go b/google-beta/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go index 81bd91cea7..44b95566da 100644 --- a/google-beta/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go +++ b/google-beta/services/cloudidentity/data_source_cloud_identity_group_memberships_test.go @@ -5,7 +5,7 @@ package cloudidentity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudidentity/data_source_cloud_identity_groups_test.go b/google-beta/services/cloudidentity/data_source_cloud_identity_groups_test.go index ab54e4d294..6364505473 100644 --- a/google-beta/services/cloudidentity/data_source_cloud_identity_groups_test.go +++ b/google-beta/services/cloudidentity/data_source_cloud_identity_groups_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudidentity/resource_cloud_identity_group_membership_test.go b/google-beta/services/cloudidentity/resource_cloud_identity_group_membership_test.go index 27cc5d60dd..dfc0b0b6bd 100644 --- a/google-beta/services/cloudidentity/resource_cloud_identity_group_membership_test.go +++ b/google-beta/services/cloudidentity/resource_cloud_identity_group_membership_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudidentity/resource_cloud_identity_group_test.go b/google-beta/services/cloudidentity/resource_cloud_identity_group_test.go index 47bfe4afe9..a936cc91cd 100644 --- a/google-beta/services/cloudidentity/resource_cloud_identity_group_test.go +++ b/google-beta/services/cloudidentity/resource_cloud_identity_group_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudids/resource_cloudids_endpoint_test.go b/google-beta/services/cloudids/resource_cloudids_endpoint_test.go index f5e1090911..43cc0ae546 100644 --- a/google-beta/services/cloudids/resource_cloudids_endpoint_test.go +++ b/google-beta/services/cloudids/resource_cloudids_endpoint_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go b/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go index e399a5bd36..21922f5d50 100644 --- a/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go +++ b/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_info_test.go @@ -7,7 +7,7 @@ package cloudquotas_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go b/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go index 6e91934ecc..1415f7a6a3 100644 --- a/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go +++ b/google-beta/services/cloudquotas/data_source_google_cloud_quotas_quota_infos_test.go @@ -5,7 +5,7 @@ package cloudquotas_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go b/google-beta/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go index 16d14b88f0..25e8ee1c4d 100644 --- a/google-beta/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go +++ b/google-beta/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go @@ -5,7 +5,7 @@ package cloudquotas_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudrun/data_source_cloud_run_locations_test.go b/google-beta/services/cloudrun/data_source_cloud_run_locations_test.go index 75c9fa83d6..54b8a9a1e4 100644 --- a/google-beta/services/cloudrun/data_source_cloud_run_locations_test.go +++ b/google-beta/services/cloudrun/data_source_cloud_run_locations_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleCloudRunLocations_basic(t *testing.T) { diff --git a/google-beta/services/cloudrun/data_source_cloud_run_service_test.go b/google-beta/services/cloudrun/data_source_cloud_run_service_test.go index d3ba39db13..5ba9009ee1 100644 --- a/google-beta/services/cloudrun/data_source_cloud_run_service_test.go +++ b/google-beta/services/cloudrun/data_source_cloud_run_service_test.go @@ -5,7 +5,7 @@ package cloudrun_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudrun/iam_cloud_run_service_generated_test.go b/google-beta/services/cloudrun/iam_cloud_run_service_generated_test.go index cb13f507a7..b2d0dd4903 100644 --- a/google-beta/services/cloudrun/iam_cloud_run_service_generated_test.go +++ b/google-beta/services/cloudrun/iam_cloud_run_service_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go b/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go index c5525f54e3..6261751be7 100644 --- a/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go +++ b/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_test.go b/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_test.go index 2e829eb349..7f601775a9 100644 --- a/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_test.go +++ b/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_test.go @@ -5,7 +5,7 @@ package cloudrun_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go b/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go index 5c01aeee29..cdfbe4bd57 100644 --- a/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go +++ b/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudrun/resource_cloud_run_service_test.go b/google-beta/services/cloudrun/resource_cloud_run_service_test.go index b09820c7e6..7e2715a4e7 100644 --- a/google-beta/services/cloudrun/resource_cloud_run_service_test.go +++ b/google-beta/services/cloudrun/resource_cloud_run_service_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudRunService_cloudRunServiceUpdate(t *testing.T) { diff --git a/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go b/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go index f0d337ad67..1c8ca3c8b0 100644 --- a/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go +++ b/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_job_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go b/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go index c9af27d7fb..eb3e4ccf82 100644 --- a/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go +++ b/google-beta/services/cloudrunv2/data_source_google_cloud_run_v2_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/cloudrunv2/iam_cloud_run_v2_job_generated_test.go b/google-beta/services/cloudrunv2/iam_cloud_run_v2_job_generated_test.go index 2126b42ce1..7d9a06e81c 100644 --- a/google-beta/services/cloudrunv2/iam_cloud_run_v2_job_generated_test.go +++ b/google-beta/services/cloudrunv2/iam_cloud_run_v2_job_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudrunv2/iam_cloud_run_v2_service_generated_test.go b/google-beta/services/cloudrunv2/iam_cloud_run_v2_service_generated_test.go index 0d7ca8d41b..a80e8532dd 100644 --- a/google-beta/services/cloudrunv2/iam_cloud_run_v2_service_generated_test.go +++ b/google-beta/services/cloudrunv2/iam_cloud_run_v2_service_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go index ff97d0ba2f..03ea0de3f6 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_test.go index 8f060c36a5..4d36ecfdb5 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go index 64ea118fdd..5deaafb6a2 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_test.go index 88f504f229..526b58a210 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrunv2" ) diff --git a/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go b/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go index 4e77677ea4..8d349699d0 100644 --- a/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go +++ b/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_test.go b/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_test.go index d845d6492d..52071fe2b1 100644 --- a/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_test.go +++ b/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_test.go @@ -5,7 +5,7 @@ package cloudscheduler_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudscheduler" ) diff --git a/google-beta/services/cloudtasks/iam_cloud_tasks_queue_generated_test.go b/google-beta/services/cloudtasks/iam_cloud_tasks_queue_generated_test.go index 896c82bca7..de20df9136 100644 --- a/google-beta/services/cloudtasks/iam_cloud_tasks_queue_generated_test.go +++ b/google-beta/services/cloudtasks/iam_cloud_tasks_queue_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go b/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go index d3e784d512..eb7a134b83 100644 --- a/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go +++ b/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/cloudtasks/resource_cloud_tasks_queue_test.go b/google-beta/services/cloudtasks/resource_cloud_tasks_queue_test.go index 5d38f065d9..9a103e6c4d 100644 --- a/google-beta/services/cloudtasks/resource_cloud_tasks_queue_test.go +++ b/google-beta/services/cloudtasks/resource_cloud_tasks_queue_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccCloudTasksQueue_update(t *testing.T) { diff --git a/google-beta/services/composer/data_source_google_composer_environment_test.go b/google-beta/services/composer/data_source_google_composer_environment_test.go index 86cc29a7aa..a1bdf84bd1 100644 --- a/google-beta/services/composer/data_source_google_composer_environment_test.go +++ b/google-beta/services/composer/data_source_google_composer_environment_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/composer/data_source_google_composer_image_versions_test.go b/google-beta/services/composer/data_source_google_composer_image_versions_test.go index 57b726007e..5189f6b55c 100644 --- a/google-beta/services/composer/data_source_google_composer_image_versions_test.go +++ b/google-beta/services/composer/data_source_google_composer_image_versions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/composer/data_source_google_composer_user_workloads_config_map_test.go b/google-beta/services/composer/data_source_google_composer_user_workloads_config_map_test.go index 0cb49475ae..934d059210 100644 --- a/google-beta/services/composer/data_source_google_composer_user_workloads_config_map_test.go +++ b/google-beta/services/composer/data_source_google_composer_user_workloads_config_map_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/composer/data_source_google_composer_user_workloads_secret_test.go b/google-beta/services/composer/data_source_google_composer_user_workloads_secret_test.go index 8800052f4d..452a75800b 100644 --- a/google-beta/services/composer/data_source_google_composer_user_workloads_secret_test.go +++ b/google-beta/services/composer/data_source_google_composer_user_workloads_secret_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/composer/resource_composer_environment_test.go b/google-beta/services/composer/resource_composer_environment_test.go index f0c3ee3377..4023209445 100644 --- a/google-beta/services/composer/resource_composer_environment_test.go +++ b/google-beta/services/composer/resource_composer_environment_test.go @@ -15,8 +15,8 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const testComposerEnvironmentPrefix = "tf-test-composer-env" diff --git a/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go b/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go index 27f3bfebe0..a89ee95356 100644 --- a/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go +++ b/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/composer/resource_composer_user_workloads_config_map_test.go b/google-beta/services/composer/resource_composer_user_workloads_config_map_test.go index 34fe7beea7..2798904b62 100644 --- a/google-beta/services/composer/resource_composer_user_workloads_config_map_test.go +++ b/google-beta/services/composer/resource_composer_user_workloads_config_map_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/composer/resource_composer_user_workloads_secret_test.go b/google-beta/services/composer/resource_composer_user_workloads_secret_test.go index 1908a006ce..3a711bc5fe 100644 --- a/google-beta/services/composer/resource_composer_user_workloads_secret_test.go +++ b/google-beta/services/composer/resource_composer_user_workloads_secret_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/composer" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const testComposerUserWorkloadsSecretPrefix = "tf-test-composer-secret" diff --git a/google-beta/services/compute/data_source_compute_health_check_test.go b/google-beta/services/compute/data_source_compute_health_check_test.go index b41f544114..38b6775f43 100644 --- a/google-beta/services/compute/data_source_compute_health_check_test.go +++ b/google-beta/services/compute/data_source_compute_health_check_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_compute_lb_ip_ranges_test.go b/google-beta/services/compute/data_source_compute_lb_ip_ranges_test.go index d333cea29a..396ed22974 100644 --- a/google-beta/services/compute/data_source_compute_lb_ip_ranges_test.go +++ b/google-beta/services/compute/data_source_compute_lb_ip_ranges_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_compute_network_endpoint_group_test.go b/google-beta/services/compute/data_source_compute_network_endpoint_group_test.go index b72070697d..e4dbf67107 100644 --- a/google-beta/services/compute/data_source_compute_network_endpoint_group_test.go +++ b/google-beta/services/compute/data_source_compute_network_endpoint_group_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_compute_network_peering_test.go b/google-beta/services/compute/data_source_compute_network_peering_test.go index 991c4a9cbe..adf396450d 100644 --- a/google-beta/services/compute/data_source_compute_network_peering_test.go +++ b/google-beta/services/compute/data_source_compute_network_peering_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_compute_secutity_policy_test.go b/google-beta/services/compute/data_source_compute_secutity_policy_test.go index 49c7d4f4cd..0b85e912f6 100644 --- a/google-beta/services/compute/data_source_compute_secutity_policy_test.go +++ b/google-beta/services/compute/data_source_compute_secutity_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_address_test.go b/google-beta/services/compute/data_source_google_compute_address_test.go index 49381fc510..597d4c7450 100644 --- a/google-beta/services/compute/data_source_google_compute_address_test.go +++ b/google-beta/services/compute/data_source_google_compute_address_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_addresses_test.go b/google-beta/services/compute/data_source_google_compute_addresses_test.go index e693532f39..bb9f98df63 100644 --- a/google-beta/services/compute/data_source_google_compute_addresses_test.go +++ b/google-beta/services/compute/data_source_google_compute_addresses_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceComputeAddresses(t *testing.T) { diff --git a/google-beta/services/compute/data_source_google_compute_backend_bucket_test.go b/google-beta/services/compute/data_source_google_compute_backend_bucket_test.go index 1e36c75b94..3a3b9c892a 100644 --- a/google-beta/services/compute/data_source_google_compute_backend_bucket_test.go +++ b/google-beta/services/compute/data_source_google_compute_backend_bucket_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_backend_service_test.go b/google-beta/services/compute/data_source_google_compute_backend_service_test.go index fca469f418..d6ffe66d8d 100644 --- a/google-beta/services/compute/data_source_google_compute_backend_service_test.go +++ b/google-beta/services/compute/data_source_google_compute_backend_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_default_service_account_test.go b/google-beta/services/compute/data_source_google_compute_default_service_account_test.go index 510ee8bf8b..ba8466f270 100644 --- a/google-beta/services/compute/data_source_google_compute_default_service_account_test.go +++ b/google-beta/services/compute/data_source_google_compute_default_service_account_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_disk_test.go b/google-beta/services/compute/data_source_google_compute_disk_test.go index 3fe5ef53d0..faa6378216 100644 --- a/google-beta/services/compute/data_source_google_compute_disk_test.go +++ b/google-beta/services/compute/data_source_google_compute_disk_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_forwarding_rule_test.go b/google-beta/services/compute/data_source_google_compute_forwarding_rule_test.go index a238e46ede..0619aac72f 100644 --- a/google-beta/services/compute/data_source_google_compute_forwarding_rule_test.go +++ b/google-beta/services/compute/data_source_google_compute_forwarding_rule_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_forwarding_rules_test.go b/google-beta/services/compute/data_source_google_compute_forwarding_rules_test.go index 031917f178..ec188fe64c 100644 --- a/google-beta/services/compute/data_source_google_compute_forwarding_rules_test.go +++ b/google-beta/services/compute/data_source_google_compute_forwarding_rules_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_global_address_test.go b/google-beta/services/compute/data_source_google_compute_global_address_test.go index 99bef1457f..7231724d70 100644 --- a/google-beta/services/compute/data_source_google_compute_global_address_test.go +++ b/google-beta/services/compute/data_source_google_compute_global_address_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/services/compute/data_source_google_compute_ha_vpn_gateway_test.go b/google-beta/services/compute/data_source_google_compute_ha_vpn_gateway_test.go index 168c583309..7112e8d503 100644 --- a/google-beta/services/compute/data_source_google_compute_ha_vpn_gateway_test.go +++ b/google-beta/services/compute/data_source_google_compute_ha_vpn_gateway_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_image_test.go b/google-beta/services/compute/data_source_google_compute_image_test.go index 9a7c0dbf21..d0a52444c9 100644 --- a/google-beta/services/compute/data_source_google_compute_image_test.go +++ b/google-beta/services/compute/data_source_google_compute_image_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/services/compute/data_source_google_compute_instance_group_manager_test.go b/google-beta/services/compute/data_source_google_compute_instance_group_manager_test.go index 4e6d32f1d2..06aa2b9bbd 100644 --- a/google-beta/services/compute/data_source_google_compute_instance_group_manager_test.go +++ b/google-beta/services/compute/data_source_google_compute_instance_group_manager_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_instance_group_test.go b/google-beta/services/compute/data_source_google_compute_instance_group_test.go index d823c8bee3..dda9d40e8a 100644 --- a/google-beta/services/compute/data_source_google_compute_instance_group_test.go +++ b/google-beta/services/compute/data_source_google_compute_instance_group_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/services/compute/data_source_google_compute_instance_serial_port_test.go b/google-beta/services/compute/data_source_google_compute_instance_serial_port_test.go index f398d4b9a3..476f3807f6 100644 --- a/google-beta/services/compute/data_source_google_compute_instance_serial_port_test.go +++ b/google-beta/services/compute/data_source_google_compute_instance_serial_port_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceComputeInstanceSerialPort_basic(t *testing.T) { diff --git a/google-beta/services/compute/data_source_google_compute_instance_template_test.go b/google-beta/services/compute/data_source_google_compute_instance_template_test.go index 2e2a103492..2f02902f9f 100644 --- a/google-beta/services/compute/data_source_google_compute_instance_template_test.go +++ b/google-beta/services/compute/data_source_google_compute_instance_template_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_instance_test.go b/google-beta/services/compute/data_source_google_compute_instance_test.go index 541fe8208a..9f986a28df 100644 --- a/google-beta/services/compute/data_source_google_compute_instance_test.go +++ b/google-beta/services/compute/data_source_google_compute_instance_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_machine_types_test.go b/google-beta/services/compute/data_source_google_compute_machine_types_test.go index 3eb2880380..83f380120c 100644 --- a/google-beta/services/compute/data_source_google_compute_machine_types_test.go +++ b/google-beta/services/compute/data_source_google_compute_machine_types_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_network_test.go b/google-beta/services/compute/data_source_google_compute_network_test.go index d6a5a4642a..1c3b3a9b3a 100644 --- a/google-beta/services/compute/data_source_google_compute_network_test.go +++ b/google-beta/services/compute/data_source_google_compute_network_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/services/compute/data_source_google_compute_networks_test.go b/google-beta/services/compute/data_source_google_compute_networks_test.go index efc141c40b..115e3b2a69 100644 --- a/google-beta/services/compute/data_source_google_compute_networks_test.go +++ b/google-beta/services/compute/data_source_google_compute_networks_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_node_types_test.go b/google-beta/services/compute/data_source_google_compute_node_types_test.go index 5add27f6b0..276c7a135e 100644 --- a/google-beta/services/compute/data_source_google_compute_node_types_test.go +++ b/google-beta/services/compute/data_source_google_compute_node_types_test.go @@ -10,8 +10,8 @@ import ( "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_region_disk_test.go b/google-beta/services/compute/data_source_google_compute_region_disk_test.go index d64439d8d2..5875ef3b14 100644 --- a/google-beta/services/compute/data_source_google_compute_region_disk_test.go +++ b/google-beta/services/compute/data_source_google_compute_region_disk_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_region_instance_group_test.go b/google-beta/services/compute/data_source_google_compute_region_instance_group_test.go index 35a094c407..ad1752c10c 100644 --- a/google-beta/services/compute/data_source_google_compute_region_instance_group_test.go +++ b/google-beta/services/compute/data_source_google_compute_region_instance_group_test.go @@ -4,7 +4,7 @@ package compute_test import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" diff --git a/google-beta/services/compute/data_source_google_compute_region_instance_template_test.go b/google-beta/services/compute/data_source_google_compute_region_instance_template_test.go index 6933e79c43..1f9404ae98 100644 --- a/google-beta/services/compute/data_source_google_compute_region_instance_template_test.go +++ b/google-beta/services/compute/data_source_google_compute_region_instance_template_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_region_network_endpoint_group_test.go b/google-beta/services/compute/data_source_google_compute_region_network_endpoint_group_test.go index 162cbe3bd4..01445563d1 100644 --- a/google-beta/services/compute/data_source_google_compute_region_network_endpoint_group_test.go +++ b/google-beta/services/compute/data_source_google_compute_region_network_endpoint_group_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_region_ssl_certificate_test.go b/google-beta/services/compute/data_source_google_compute_region_ssl_certificate_test.go index c8986530cc..5868b82c98 100644 --- a/google-beta/services/compute/data_source_google_compute_region_ssl_certificate_test.go +++ b/google-beta/services/compute/data_source_google_compute_region_ssl_certificate_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_regions_test.go b/google-beta/services/compute/data_source_google_compute_regions_test.go index b43f8432ba..3893a1a9fc 100644 --- a/google-beta/services/compute/data_source_google_compute_regions_test.go +++ b/google-beta/services/compute/data_source_google_compute_regions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_reservation_test.go b/google-beta/services/compute/data_source_google_compute_reservation_test.go index edc423f22a..1befb62c61 100644 --- a/google-beta/services/compute/data_source_google_compute_reservation_test.go +++ b/google-beta/services/compute/data_source_google_compute_reservation_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_resource_policy_test.go b/google-beta/services/compute/data_source_google_compute_resource_policy_test.go index c20d2f5e7f..63244026b7 100644 --- a/google-beta/services/compute/data_source_google_compute_resource_policy_test.go +++ b/google-beta/services/compute/data_source_google_compute_resource_policy_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceComputeResourcePolicy(t *testing.T) { diff --git a/google-beta/services/compute/data_source_google_compute_router_nat_test.go b/google-beta/services/compute/data_source_google_compute_router_nat_test.go index 279daf8411..eb265589fb 100644 --- a/google-beta/services/compute/data_source_google_compute_router_nat_test.go +++ b/google-beta/services/compute/data_source_google_compute_router_nat_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_router_status_test.go b/google-beta/services/compute/data_source_google_compute_router_status_test.go index d945abe0ab..f5523c291e 100644 --- a/google-beta/services/compute/data_source_google_compute_router_status_test.go +++ b/google-beta/services/compute/data_source_google_compute_router_status_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_router_test.go b/google-beta/services/compute/data_source_google_compute_router_test.go index fde8e85f26..2557f53062 100644 --- a/google-beta/services/compute/data_source_google_compute_router_test.go +++ b/google-beta/services/compute/data_source_google_compute_router_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_snapshot_test.go b/google-beta/services/compute/data_source_google_compute_snapshot_test.go index 376d3e5741..f2646f6819 100644 --- a/google-beta/services/compute/data_source_google_compute_snapshot_test.go +++ b/google-beta/services/compute/data_source_google_compute_snapshot_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_ssl_certificate_test.go b/google-beta/services/compute/data_source_google_compute_ssl_certificate_test.go index d113492b16..b3af4a8148 100644 --- a/google-beta/services/compute/data_source_google_compute_ssl_certificate_test.go +++ b/google-beta/services/compute/data_source_google_compute_ssl_certificate_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_ssl_policy_test.go b/google-beta/services/compute/data_source_google_compute_ssl_policy_test.go index 033cb8f906..af110a947d 100644 --- a/google-beta/services/compute/data_source_google_compute_ssl_policy_test.go +++ b/google-beta/services/compute/data_source_google_compute_ssl_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_compute_subnetwork_test.go b/google-beta/services/compute/data_source_google_compute_subnetwork_test.go index bedce58933..ae3bb52298 100644 --- a/google-beta/services/compute/data_source_google_compute_subnetwork_test.go +++ b/google-beta/services/compute/data_source_google_compute_subnetwork_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/services/compute/data_source_google_compute_subnetworks_test.go b/google-beta/services/compute/data_source_google_compute_subnetworks_test.go index b1d92c3627..0f8a606cc1 100644 --- a/google-beta/services/compute/data_source_google_compute_subnetworks_test.go +++ b/google-beta/services/compute/data_source_google_compute_subnetworks_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/data_source_google_compute_vpn_gateway_test.go b/google-beta/services/compute/data_source_google_compute_vpn_gateway_test.go index 3c22dd30bb..44cba6b83b 100644 --- a/google-beta/services/compute/data_source_google_compute_vpn_gateway_test.go +++ b/google-beta/services/compute/data_source_google_compute_vpn_gateway_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" ) diff --git a/google-beta/services/compute/data_source_google_compute_zones_test.go b/google-beta/services/compute/data_source_google_compute_zones_test.go index 93f0b01e65..fe44c02b43 100644 --- a/google-beta/services/compute/data_source_google_compute_zones_test.go +++ b/google-beta/services/compute/data_source_google_compute_zones_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/data_source_google_global_compute_forwarding_rule_test.go b/google-beta/services/compute/data_source_google_global_compute_forwarding_rule_test.go index 32a7986889..87f71640fb 100644 --- a/google-beta/services/compute/data_source_google_global_compute_forwarding_rule_test.go +++ b/google-beta/services/compute/data_source_google_global_compute_forwarding_rule_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/iam_compute_backend_bucket_generated_test.go b/google-beta/services/compute/iam_compute_backend_bucket_generated_test.go index 24cfabfbc0..eb1987bf98 100644 --- a/google-beta/services/compute/iam_compute_backend_bucket_generated_test.go +++ b/google-beta/services/compute/iam_compute_backend_bucket_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_backend_service_generated_test.go b/google-beta/services/compute/iam_compute_backend_service_generated_test.go index 9889ce7166..85a7f98229 100644 --- a/google-beta/services/compute/iam_compute_backend_service_generated_test.go +++ b/google-beta/services/compute/iam_compute_backend_service_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_disk_generated_test.go b/google-beta/services/compute/iam_compute_disk_generated_test.go index 6a7296a89b..6d31448b78 100644 --- a/google-beta/services/compute/iam_compute_disk_generated_test.go +++ b/google-beta/services/compute/iam_compute_disk_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_image_generated_test.go b/google-beta/services/compute/iam_compute_image_generated_test.go index 12f4401de4..9c68f5d47f 100644 --- a/google-beta/services/compute/iam_compute_image_generated_test.go +++ b/google-beta/services/compute/iam_compute_image_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_instance_generated_test.go b/google-beta/services/compute/iam_compute_instance_generated_test.go index 56ebd18b2b..34e7931b14 100644 --- a/google-beta/services/compute/iam_compute_instance_generated_test.go +++ b/google-beta/services/compute/iam_compute_instance_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_instance_test.go b/google-beta/services/compute/iam_compute_instance_test.go index d4c8819b6c..00600cd3b5 100644 --- a/google-beta/services/compute/iam_compute_instance_test.go +++ b/google-beta/services/compute/iam_compute_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/iam_compute_machine_image_generated_test.go b/google-beta/services/compute/iam_compute_machine_image_generated_test.go index 514d545e5e..051b99fd4a 100644 --- a/google-beta/services/compute/iam_compute_machine_image_generated_test.go +++ b/google-beta/services/compute/iam_compute_machine_image_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_region_backend_service_generated_test.go b/google-beta/services/compute/iam_compute_region_backend_service_generated_test.go index dae10bc8d7..26dd61cf86 100644 --- a/google-beta/services/compute/iam_compute_region_backend_service_generated_test.go +++ b/google-beta/services/compute/iam_compute_region_backend_service_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_region_disk_generated_test.go b/google-beta/services/compute/iam_compute_region_disk_generated_test.go index 8eb0a3a8a1..39998bb3e0 100644 --- a/google-beta/services/compute/iam_compute_region_disk_generated_test.go +++ b/google-beta/services/compute/iam_compute_region_disk_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_snapshot_generated_test.go b/google-beta/services/compute/iam_compute_snapshot_generated_test.go index 735487dd20..fd2bcd8636 100644 --- a/google-beta/services/compute/iam_compute_snapshot_generated_test.go +++ b/google-beta/services/compute/iam_compute_snapshot_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_subnetwork_generated_test.go b/google-beta/services/compute/iam_compute_subnetwork_generated_test.go index 7cce13a7ed..6f8c43a444 100644 --- a/google-beta/services/compute/iam_compute_subnetwork_generated_test.go +++ b/google-beta/services/compute/iam_compute_subnetwork_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/iam_compute_subnetwork_test.go b/google-beta/services/compute/iam_compute_subnetwork_test.go index 006158aa47..c90fbb87ec 100644 --- a/google-beta/services/compute/iam_compute_subnetwork_test.go +++ b/google-beta/services/compute/iam_compute_subnetwork_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_address_generated_test.go b/google-beta/services/compute/resource_compute_address_generated_test.go index 397b1f89a5..37545a7fa8 100644 --- a/google-beta/services/compute/resource_compute_address_generated_test.go +++ b/google-beta/services/compute/resource_compute_address_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_address_test.go b/google-beta/services/compute/resource_compute_address_test.go index dc27dbcf37..3cb2d34966 100644 --- a/google-beta/services/compute/resource_compute_address_test.go +++ b/google-beta/services/compute/resource_compute_address_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_attached_disk_test.go b/google-beta/services/compute/resource_compute_attached_disk_test.go index b0c11a7f95..87c634f3f6 100644 --- a/google-beta/services/compute/resource_compute_attached_disk_test.go +++ b/google-beta/services/compute/resource_compute_attached_disk_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" diff --git a/google-beta/services/compute/resource_compute_autoscaler_generated_test.go b/google-beta/services/compute/resource_compute_autoscaler_generated_test.go index b9b32c9fdc..48b836a568 100644 --- a/google-beta/services/compute/resource_compute_autoscaler_generated_test.go +++ b/google-beta/services/compute/resource_compute_autoscaler_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_autoscaler_test.go b/google-beta/services/compute/resource_compute_autoscaler_test.go index 596daf5cc8..9c24bb6567 100644 --- a/google-beta/services/compute/resource_compute_autoscaler_test.go +++ b/google-beta/services/compute/resource_compute_autoscaler_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeAutoscaler_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go b/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go index f2ceaeb3b6..115cc68e82 100644 --- a/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go +++ b/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_backend_bucket_signed_url_key_test.go b/google-beta/services/compute/resource_compute_backend_bucket_signed_url_key_test.go index 7031a47bf5..dfdceb3d4f 100644 --- a/google-beta/services/compute/resource_compute_backend_bucket_signed_url_key_test.go +++ b/google-beta/services/compute/resource_compute_backend_bucket_signed_url_key_test.go @@ -8,8 +8,8 @@ import ( "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_backend_bucket_test.go b/google-beta/services/compute/resource_compute_backend_bucket_test.go index 7e0f1bd969..cf0cbf0207 100644 --- a/google-beta/services/compute/resource_compute_backend_bucket_test.go +++ b/google-beta/services/compute/resource_compute_backend_bucket_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_backend_service_generated_test.go b/google-beta/services/compute/resource_compute_backend_service_generated_test.go index 0a4a7d3880..a36c983568 100644 --- a/google-beta/services/compute/resource_compute_backend_service_generated_test.go +++ b/google-beta/services/compute/resource_compute_backend_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_backend_service_signed_url_key_test.go b/google-beta/services/compute/resource_compute_backend_service_signed_url_key_test.go index fadec0fda6..0183be859b 100644 --- a/google-beta/services/compute/resource_compute_backend_service_signed_url_key_test.go +++ b/google-beta/services/compute/resource_compute_backend_service_signed_url_key_test.go @@ -8,8 +8,8 @@ import ( "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_backend_service_test.go b/google-beta/services/compute/resource_compute_backend_service_test.go index d749014952..cd327946f2 100644 --- a/google-beta/services/compute/resource_compute_backend_service_test.go +++ b/google-beta/services/compute/resource_compute_backend_service_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeBackendService_basic(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_disk_async_replication_test.go b/google-beta/services/compute/resource_compute_disk_async_replication_test.go index a299cddb04..27c7b7e124 100644 --- a/google-beta/services/compute/resource_compute_disk_async_replication_test.go +++ b/google-beta/services/compute/resource_compute_disk_async_replication_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_disk_generated_test.go b/google-beta/services/compute/resource_compute_disk_generated_test.go index 1a78bafbb5..6e077f6448 100644 --- a/google-beta/services/compute/resource_compute_disk_generated_test.go +++ b/google-beta/services/compute/resource_compute_disk_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go b/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go index c28e22de4e..e808f7c920 100644 --- a/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_test.go b/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_test.go index 0b739b1ed7..8e1dda0fd2 100644 --- a/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_test.go +++ b/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_disk_test.go b/google-beta/services/compute/resource_compute_disk_test.go index 31379cfe1c..896e3f0d2c 100644 --- a/google-beta/services/compute/resource_compute_disk_test.go +++ b/google-beta/services/compute/resource_compute_disk_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" diff --git a/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go b/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go index c2aa635b65..c03d194da2 100644 --- a/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go +++ b/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_external_vpn_gateway_test.go b/google-beta/services/compute/resource_compute_external_vpn_gateway_test.go index 97fc5a3e3a..9790156d05 100644 --- a/google-beta/services/compute/resource_compute_external_vpn_gateway_test.go +++ b/google-beta/services/compute/resource_compute_external_vpn_gateway_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_firewall_generated_test.go b/google-beta/services/compute/resource_compute_firewall_generated_test.go index 973f529698..1a01c6ff01 100644 --- a/google-beta/services/compute/resource_compute_firewall_generated_test.go +++ b/google-beta/services/compute/resource_compute_firewall_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_firewall_policy_association_test.go b/google-beta/services/compute/resource_compute_firewall_policy_association_test.go index 652b4e7937..9bd487b9ac 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_association_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_association_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go index 5d14c92e67..bd053416e7 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/compute/resource_compute_firewall_policy_rule_test.go b/google-beta/services/compute/resource_compute_firewall_policy_rule_test.go index 2fb98b03f3..db352bc3c7 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_rule_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_rule_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_firewall_policy_test.go b/google-beta/services/compute/resource_compute_firewall_policy_test.go index e4a5962f21..dcd8663ab3 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeFirewallPolicy_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_firewall_test.go b/google-beta/services/compute/resource_compute_firewall_test.go index ac41df08bb..d57d0b6997 100644 --- a/google-beta/services/compute/resource_compute_firewall_test.go +++ b/google-beta/services/compute/resource_compute_firewall_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go b/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go index e5fdd55a1c..62b8d03944 100644 --- a/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_forwarding_rule_test.go b/google-beta/services/compute/resource_compute_forwarding_rule_test.go index effd114037..44e27c1c03 100644 --- a/google-beta/services/compute/resource_compute_forwarding_rule_test.go +++ b/google-beta/services/compute/resource_compute_forwarding_rule_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeForwardingRule_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_global_address_generated_test.go b/google-beta/services/compute/resource_compute_global_address_generated_test.go index b5cc913a59..621cafcbe7 100644 --- a/google-beta/services/compute/resource_compute_global_address_generated_test.go +++ b/google-beta/services/compute/resource_compute_global_address_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_global_address_test.go b/google-beta/services/compute/resource_compute_global_address_test.go index 625071a69b..49f99911bd 100644 --- a/google-beta/services/compute/resource_compute_global_address_test.go +++ b/google-beta/services/compute/resource_compute_global_address_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeGlobalAddress_ipv6(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go b/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go index 7d57f25ab0..a2d25ed5f7 100644 --- a/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_global_forwarding_rule_test.go b/google-beta/services/compute/resource_compute_global_forwarding_rule_test.go index 4bfa228956..4400926621 100644 --- a/google-beta/services/compute/resource_compute_global_forwarding_rule_test.go +++ b/google-beta/services/compute/resource_compute_global_forwarding_rule_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" ) diff --git a/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go b/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go index 932aab0bc6..a5d8698367 100644 --- a/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_global_network_endpoint_test.go b/google-beta/services/compute/resource_compute_global_network_endpoint_test.go index 45fbf229a0..f277bb9407 100644 --- a/google-beta/services/compute/resource_compute_global_network_endpoint_test.go +++ b/google-beta/services/compute/resource_compute_global_network_endpoint_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go b/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go index 954e8947d5..8cde8f31d9 100644 --- a/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go +++ b/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_health_check_generated_test.go b/google-beta/services/compute/resource_compute_health_check_generated_test.go index fa88d28513..a73e156e03 100644 --- a/google-beta/services/compute/resource_compute_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_health_check_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_health_check_test.go b/google-beta/services/compute/resource_compute_health_check_test.go index 5afaebb664..e4670bf7b4 100644 --- a/google-beta/services/compute/resource_compute_health_check_test.go +++ b/google-beta/services/compute/resource_compute_health_check_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_http_health_check_generated_test.go b/google-beta/services/compute/resource_compute_http_health_check_generated_test.go index 2c80fb4767..cb31a9dab3 100644 --- a/google-beta/services/compute/resource_compute_http_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_http_health_check_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_http_health_check_test.go b/google-beta/services/compute/resource_compute_http_health_check_test.go index 3d1b704bfb..0344cedf03 100644 --- a/google-beta/services/compute/resource_compute_http_health_check_test.go +++ b/google-beta/services/compute/resource_compute_http_health_check_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_https_health_check_generated_test.go b/google-beta/services/compute/resource_compute_https_health_check_generated_test.go index a2093b3478..97ebf2961f 100644 --- a/google-beta/services/compute/resource_compute_https_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_https_health_check_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_https_health_check_test.go b/google-beta/services/compute/resource_compute_https_health_check_test.go index 0cd7262455..28d02ca3ca 100644 --- a/google-beta/services/compute/resource_compute_https_health_check_test.go +++ b/google-beta/services/compute/resource_compute_https_health_check_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_image_generated_test.go b/google-beta/services/compute/resource_compute_image_generated_test.go index 08b1ce9875..633266a761 100644 --- a/google-beta/services/compute/resource_compute_image_generated_test.go +++ b/google-beta/services/compute/resource_compute_image_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_image_test.go b/google-beta/services/compute/resource_compute_image_test.go index ba4fa00747..06770f42d3 100644 --- a/google-beta/services/compute/resource_compute_image_test.go +++ b/google-beta/services/compute/resource_compute_image_test.go @@ -10,8 +10,8 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_instance_from_machine_image_test.go b/google-beta/services/compute/resource_compute_instance_from_machine_image_test.go index ffe32c56cc..9ef562cdbd 100644 --- a/google-beta/services/compute/resource_compute_instance_from_machine_image_test.go +++ b/google-beta/services/compute/resource_compute_instance_from_machine_image_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_instance_from_template_test.go b/google-beta/services/compute/resource_compute_instance_from_template_test.go index dacc445b10..b09f7e675c 100644 --- a/google-beta/services/compute/resource_compute_instance_from_template_test.go +++ b/google-beta/services/compute/resource_compute_instance_from_template_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" compute "google.golang.org/api/compute/v0.beta" diff --git a/google-beta/services/compute/resource_compute_instance_group_manager_test.go b/google-beta/services/compute/resource_compute_instance_group_manager_test.go index cd69513f46..009ea92f2a 100644 --- a/google-beta/services/compute/resource_compute_instance_group_manager_test.go +++ b/google-beta/services/compute/resource_compute_instance_group_manager_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_instance_group_membership_test.go b/google-beta/services/compute/resource_compute_instance_group_membership_test.go index 8b55a10bae..ba90f76189 100644 --- a/google-beta/services/compute/resource_compute_instance_group_membership_test.go +++ b/google-beta/services/compute/resource_compute_instance_group_membership_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go b/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go index 1571eb4606..df1ed8f94d 100644 --- a/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go +++ b/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_instance_group_test.go b/google-beta/services/compute/resource_compute_instance_group_test.go index 6db1262012..40f990a5e5 100644 --- a/google-beta/services/compute/resource_compute_instance_group_test.go +++ b/google-beta/services/compute/resource_compute_instance_group_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_instance_settings_generated_test.go b/google-beta/services/compute/resource_compute_instance_settings_generated_test.go index 95a5897210..6ea41c1301 100644 --- a/google-beta/services/compute/resource_compute_instance_settings_generated_test.go +++ b/google-beta/services/compute/resource_compute_instance_settings_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_instance_settings_test.go b/google-beta/services/compute/resource_compute_instance_settings_test.go index 3117175b32..59af99f58b 100644 --- a/google-beta/services/compute/resource_compute_instance_settings_test.go +++ b/google-beta/services/compute/resource_compute_instance_settings_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_instance_template_test.go b/google-beta/services/compute/resource_compute_instance_template_test.go index 87abd5e949..6520181898 100644 --- a/google-beta/services/compute/resource_compute_instance_template_test.go +++ b/google-beta/services/compute/resource_compute_instance_template_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" diff --git a/google-beta/services/compute/resource_compute_instance_test.go b/google-beta/services/compute/resource_compute_instance_test.go index a6e8ea6f2b..ff4f333030 100644 --- a/google-beta/services/compute/resource_compute_instance_test.go +++ b/google-beta/services/compute/resource_compute_instance_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go index 1d63be0e98..7d443ca548 100644 --- a/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_interconnect_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_generated_test.go index a812a70167..da76d8bbcf 100644 --- a/google-beta/services/compute/resource_compute_interconnect_generated_test.go +++ b/google-beta/services/compute/resource_compute_interconnect_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_machine_image_generated_test.go b/google-beta/services/compute/resource_compute_machine_image_generated_test.go index f9555604b7..844ef05cf5 100644 --- a/google-beta/services/compute/resource_compute_machine_image_generated_test.go +++ b/google-beta/services/compute/resource_compute_machine_image_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go b/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go index f2cd13204f..93c81ac9b4 100644 --- a/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go +++ b/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_network_attachment_generated_test.go b/google-beta/services/compute/resource_compute_network_attachment_generated_test.go index 3a2f828354..39844b9d3b 100644 --- a/google-beta/services/compute/resource_compute_network_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go b/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go index ed0160a182..ddd232e7c8 100644 --- a/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_network_edge_security_service_test.go b/google-beta/services/compute/resource_compute_network_edge_security_service_test.go index 9f64653958..0766e604b3 100644 --- a/google-beta/services/compute/resource_compute_network_edge_security_service_test.go +++ b/google-beta/services/compute/resource_compute_network_edge_security_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go b/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go index 05a66cdde5..b9c7f6d782 100644 --- a/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_network_endpoint_group_test.go b/google-beta/services/compute/resource_compute_network_endpoint_group_test.go index 216a9e061c..441f6dd02e 100644 --- a/google-beta/services/compute/resource_compute_network_endpoint_group_test.go +++ b/google-beta/services/compute/resource_compute_network_endpoint_group_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_network_endpoint_test.go b/google-beta/services/compute/resource_compute_network_endpoint_test.go index 168277bada..1cad2410ca 100644 --- a/google-beta/services/compute/resource_compute_network_endpoint_test.go +++ b/google-beta/services/compute/resource_compute_network_endpoint_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_endpoints_test.go b/google-beta/services/compute/resource_compute_network_endpoints_test.go index 6f0f2517d0..f43d7ed5c7 100644 --- a/google-beta/services/compute/resource_compute_network_endpoints_test.go +++ b/google-beta/services/compute/resource_compute_network_endpoints_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go index 36ddc5d955..82dd2a252f 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go index 5dc6144457..ea1946a93d 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go index 4737e4aca4..b8fb0e294e 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_rule_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_rule_test.go index 6dd4675d7d..57498c7948 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_rule_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_rule_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_test.go index 0938bc63b6..9cb342df3b 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_test.go @@ -3,7 +3,7 @@ package compute_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" diff --git a/google-beta/services/compute/resource_compute_network_generated_test.go b/google-beta/services/compute/resource_compute_network_generated_test.go index ce18e0066f..c7d3c68874 100644 --- a/google-beta/services/compute/resource_compute_network_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go b/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go index 20fc14be54..73ae2951a8 100644 --- a/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go @@ -20,7 +20,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_network_peering_test.go b/google-beta/services/compute/resource_compute_network_peering_test.go index ceb72e264b..67ed0bc60f 100644 --- a/google-beta/services/compute/resource_compute_network_peering_test.go +++ b/google-beta/services/compute/resource_compute_network_peering_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_network_test.go b/google-beta/services/compute/resource_compute_network_test.go index 9090b20d3b..f1eeb17170 100644 --- a/google-beta/services/compute/resource_compute_network_test.go +++ b/google-beta/services/compute/resource_compute_network_test.go @@ -9,8 +9,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_node_group_generated_test.go b/google-beta/services/compute/resource_compute_node_group_generated_test.go index 88edc6865d..65b50acb52 100644 --- a/google-beta/services/compute/resource_compute_node_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_node_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_node_group_test.go b/google-beta/services/compute/resource_compute_node_group_test.go index 0b89642f47..694c188158 100644 --- a/google-beta/services/compute/resource_compute_node_group_test.go +++ b/google-beta/services/compute/resource_compute_node_group_test.go @@ -11,8 +11,8 @@ import ( "regexp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_node_template_generated_test.go b/google-beta/services/compute/resource_compute_node_template_generated_test.go index 4a53eb104c..0ae2cfaf69 100644 --- a/google-beta/services/compute/resource_compute_node_template_generated_test.go +++ b/google-beta/services/compute/resource_compute_node_template_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go index 552edfde94..0791a9870e 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go index 8c288a6bc4..ed836cf1d7 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go index 064217eea2..07b47b7c48 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_rule_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_rule_test.go index 1f2ebdbda1..74272005bf 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_rule_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_rule_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeOrganizationSecurityPolicyRule_organizationSecurityPolicyRuleUpdateExample(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_test.go index d1a889a4b7..7055f1071a 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeOrganizationSecurityPolicy_organizationSecurityPolicyUpdateExample(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go b/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go index 4a2d10555a..b612b34cfe 100644 --- a/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go +++ b/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_per_instance_config_test.go b/google-beta/services/compute/resource_compute_per_instance_config_test.go index 380703dfc7..63159c447f 100644 --- a/google-beta/services/compute/resource_compute_per_instance_config_test.go +++ b/google-beta/services/compute/resource_compute_per_instance_config_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/compute/resource_compute_project_cloud_armor_tier_test.go b/google-beta/services/compute/resource_compute_project_cloud_armor_tier_test.go index a920dc3121..65e082bc5f 100644 --- a/google-beta/services/compute/resource_compute_project_cloud_armor_tier_test.go +++ b/google-beta/services/compute/resource_compute_project_cloud_armor_tier_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_project_default_network_tier_test.go b/google-beta/services/compute/resource_compute_project_default_network_tier_test.go index b7920741a4..4e4bfbc89f 100644 --- a/google-beta/services/compute/resource_compute_project_default_network_tier_test.go +++ b/google-beta/services/compute/resource_compute_project_default_network_tier_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_project_metadata_item_test.go b/google-beta/services/compute/resource_compute_project_metadata_item_test.go index 46b516c866..0913cd18f2 100644 --- a/google-beta/services/compute/resource_compute_project_metadata_item_test.go +++ b/google-beta/services/compute/resource_compute_project_metadata_item_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeProjectMetadataItem_basic(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_project_metadata_test.go b/google-beta/services/compute/resource_compute_project_metadata_test.go index 90091c32a7..583fa6e663 100644 --- a/google-beta/services/compute/resource_compute_project_metadata_test.go +++ b/google-beta/services/compute/resource_compute_project_metadata_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_public_advertised_prefix_test.go b/google-beta/services/compute/resource_compute_public_advertised_prefix_test.go index d71abcde3a..ad9687ce00 100644 --- a/google-beta/services/compute/resource_compute_public_advertised_prefix_test.go +++ b/google-beta/services/compute/resource_compute_public_advertised_prefix_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go b/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go index 3e863d4dbf..d968490928 100644 --- a/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_autoscaler_test.go b/google-beta/services/compute/resource_compute_region_autoscaler_test.go index 8e9ee73b07..47927b2094 100644 --- a/google-beta/services/compute/resource_compute_region_autoscaler_test.go +++ b/google-beta/services/compute/resource_compute_region_autoscaler_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionAutoscaler_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go b/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go index 009282a065..add9181b87 100644 --- a/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_backend_service_test.go b/google-beta/services/compute/resource_compute_region_backend_service_test.go index 0d733f5fb8..c49c32f19f 100644 --- a/google-beta/services/compute/resource_compute_region_backend_service_test.go +++ b/google-beta/services/compute/resource_compute_region_backend_service_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_region_disk_generated_test.go b/google-beta/services/compute/resource_compute_region_disk_generated_test.go index bd53acc38d..9a0aeb6338 100644 --- a/google-beta/services/compute/resource_compute_region_disk_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_disk_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go b/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go index f26a070699..b1c0901835 100644 --- a/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_disk_test.go b/google-beta/services/compute/resource_compute_region_disk_test.go index 47a43838bb..1ae037b4b9 100644 --- a/google-beta/services/compute/resource_compute_region_disk_test.go +++ b/google-beta/services/compute/resource_compute_region_disk_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_region_health_check_generated_test.go b/google-beta/services/compute/resource_compute_region_health_check_generated_test.go index 495e45e2d3..d0569ab38a 100644 --- a/google-beta/services/compute/resource_compute_region_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_health_check_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_health_check_test.go b/google-beta/services/compute/resource_compute_region_health_check_test.go index 44741053ba..32772adeaa 100644 --- a/google-beta/services/compute/resource_compute_region_health_check_test.go +++ b/google-beta/services/compute/resource_compute_region_health_check_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_region_instance_group_manager_test.go b/google-beta/services/compute/resource_compute_region_instance_group_manager_test.go index 4d805b5755..f257ea98a3 100644 --- a/google-beta/services/compute/resource_compute_region_instance_group_manager_test.go +++ b/google-beta/services/compute/resource_compute_region_instance_group_manager_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_region_instance_template_test.go b/google-beta/services/compute/resource_compute_region_instance_template_test.go index bc0c218f26..c6d20ff830 100644 --- a/google-beta/services/compute/resource_compute_region_instance_template_test.go +++ b/google-beta/services/compute/resource_compute_region_instance_template_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go index 5cb133b0b1..a5be13c77a 100644 --- a/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go index 795cee2110..f0b19d1634 100644 --- a/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_group_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_group_test.go index a9821f483e..b930b3867f 100644 --- a/google-beta/services/compute/resource_compute_region_network_endpoint_group_test.go +++ b/google-beta/services/compute/resource_compute_region_network_endpoint_group_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionNetworkEndpointGroup_negWithServerlessDeployment(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_test.go index 28067d512e..cf2d545c72 100644 --- a/google-beta/services/compute/resource_compute_region_network_endpoint_test.go +++ b/google-beta/services/compute/resource_compute_region_network_endpoint_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go index 74f12959b0..6acb6e6c53 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go index 093cfd73c3..fc70289e96 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go index 34aa513125..2f67046b67 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_test.go index 02970a5ef4..dd83d97b9e 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_test.go @@ -3,7 +3,7 @@ package compute_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" diff --git a/google-beta/services/compute/resource_compute_region_per_instance_config_test.go b/google-beta/services/compute/resource_compute_region_per_instance_config_test.go index a5a225dd19..ef3c39b513 100644 --- a/google-beta/services/compute/resource_compute_region_per_instance_config_test.go +++ b/google-beta/services/compute/resource_compute_region_per_instance_config_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeRegionPerInstanceConfig_statefulBasic(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go b/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go index 7c5bd3ad4e..b33705d7db 100644 --- a/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go index abb88df152..62ca6aa3d6 100644 --- a/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_security_policy_rule_test.go b/google-beta/services/compute/resource_compute_region_security_policy_rule_test.go index a53e1db68b..c6345550a4 100644 --- a/google-beta/services/compute/resource_compute_region_security_policy_rule_test.go +++ b/google-beta/services/compute/resource_compute_region_security_policy_rule_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionSecurityPolicyRule_regionSecurityPolicyRuleBasicUpdate(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_security_policy_test.go b/google-beta/services/compute/resource_compute_region_security_policy_test.go index f266600f0a..063faa1bd2 100644 --- a/google-beta/services/compute/resource_compute_region_security_policy_test.go +++ b/google-beta/services/compute/resource_compute_region_security_policy_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionSecurityPolicy_regionSecurityPolicyBasicUpdateExample(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go b/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go index e25db4bd12..5c7435b6d5 100644 --- a/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_ssl_policy_test.go b/google-beta/services/compute/resource_compute_region_ssl_policy_test.go index 96079a85d0..d8eb532838 100644 --- a/google-beta/services/compute/resource_compute_region_ssl_policy_test.go +++ b/google-beta/services/compute/resource_compute_region_ssl_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" compute "google.golang.org/api/compute/v0.beta" diff --git a/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go b/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go index 1ec6bb8e81..8780bca331 100644 --- a/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_target_http_proxy_test.go b/google-beta/services/compute/resource_compute_region_target_http_proxy_test.go index 6b57d195db..c752c96811 100644 --- a/google-beta/services/compute/resource_compute_region_target_http_proxy_test.go +++ b/google-beta/services/compute/resource_compute_region_target_http_proxy_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionTargetHttpProxy_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go b/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go index b963894d89..7afb222148 100644 --- a/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_target_https_proxy_test.go b/google-beta/services/compute/resource_compute_region_target_https_proxy_test.go index 5b9528dbae..ff20de9ce6 100644 --- a/google-beta/services/compute/resource_compute_region_target_https_proxy_test.go +++ b/google-beta/services/compute/resource_compute_region_target_https_proxy_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionTargetHttpsProxy_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go b/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go index 36140b550e..afa036f3b6 100644 --- a/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_target_tcp_proxy_test.go b/google-beta/services/compute/resource_compute_region_target_tcp_proxy_test.go index f58da5e664..ac62ece13f 100644 --- a/google-beta/services/compute/resource_compute_region_target_tcp_proxy_test.go +++ b/google-beta/services/compute/resource_compute_region_target_tcp_proxy_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeRegionTargetTcpProxy_update(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_region_url_map_generated_test.go b/google-beta/services/compute/resource_compute_region_url_map_generated_test.go index 236efda117..51a659ccb5 100644 --- a/google-beta/services/compute/resource_compute_region_url_map_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_url_map_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_region_url_map_test.go b/google-beta/services/compute/resource_compute_region_url_map_test.go index f69ac2f2ec..0bef56fd16 100644 --- a/google-beta/services/compute/resource_compute_region_url_map_test.go +++ b/google-beta/services/compute/resource_compute_region_url_map_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeRegionUrlMap_update_path_matcher(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_reservation_generated_test.go b/google-beta/services/compute/resource_compute_reservation_generated_test.go index 02b0ea5d11..17230b52e0 100644 --- a/google-beta/services/compute/resource_compute_reservation_generated_test.go +++ b/google-beta/services/compute/resource_compute_reservation_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/compute/resource_compute_reservation_test.go b/google-beta/services/compute/resource_compute_reservation_test.go index 9240ac64e0..c911285391 100644 --- a/google-beta/services/compute/resource_compute_reservation_test.go +++ b/google-beta/services/compute/resource_compute_reservation_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_resize_request_generated_test.go b/google-beta/services/compute/resource_compute_resize_request_generated_test.go index ef920985fe..2dc0aca10e 100644 --- a/google-beta/services/compute/resource_compute_resize_request_generated_test.go +++ b/google-beta/services/compute/resource_compute_resize_request_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_resource_policy_generated_test.go b/google-beta/services/compute/resource_compute_resource_policy_generated_test.go index 85f76b87b0..0b2e6ad0bd 100644 --- a/google-beta/services/compute/resource_compute_resource_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_resource_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_resource_policy_test.go b/google-beta/services/compute/resource_compute_resource_policy_test.go index c93ec54e63..afd1eb6702 100644 --- a/google-beta/services/compute/resource_compute_resource_policy_test.go +++ b/google-beta/services/compute/resource_compute_resource_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_route_generated_test.go b/google-beta/services/compute/resource_compute_route_generated_test.go index d33987bf2d..90c2843f7a 100644 --- a/google-beta/services/compute/resource_compute_route_generated_test.go +++ b/google-beta/services/compute/resource_compute_route_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_route_test.go b/google-beta/services/compute/resource_compute_route_test.go index 5e23203ae0..c3590d33e4 100644 --- a/google-beta/services/compute/resource_compute_route_test.go +++ b/google-beta/services/compute/resource_compute_route_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_router_bgp_peer_test.go b/google-beta/services/compute/resource_compute_router_bgp_peer_test.go index 946980f1ed..fcf98b5969 100644 --- a/google-beta/services/compute/resource_compute_router_bgp_peer_test.go +++ b/google-beta/services/compute/resource_compute_router_bgp_peer_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_router_generated_test.go b/google-beta/services/compute/resource_compute_router_generated_test.go index 14b4efe9f5..4395cd5442 100644 --- a/google-beta/services/compute/resource_compute_router_generated_test.go +++ b/google-beta/services/compute/resource_compute_router_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_router_interface_test.go b/google-beta/services/compute/resource_compute_router_interface_test.go index 68410b1f77..55cf2cf0d0 100644 --- a/google-beta/services/compute/resource_compute_router_interface_test.go +++ b/google-beta/services/compute/resource_compute_router_interface_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_router_nat_test.go b/google-beta/services/compute/resource_compute_router_nat_test.go index 44a4bbafaa..a552b2fdb9 100644 --- a/google-beta/services/compute/resource_compute_router_nat_test.go +++ b/google-beta/services/compute/resource_compute_router_nat_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_router_peer_test.go b/google-beta/services/compute/resource_compute_router_peer_test.go index 16e3357d28..d8ec5be986 100644 --- a/google-beta/services/compute/resource_compute_router_peer_test.go +++ b/google-beta/services/compute/resource_compute_router_peer_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go b/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go index ec55b712da..9f98b25fc4 100644 --- a/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_router_test.go b/google-beta/services/compute/resource_compute_router_test.go index a23ac8f640..25aa33699d 100644 --- a/google-beta/services/compute/resource_compute_router_test.go +++ b/google-beta/services/compute/resource_compute_router_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go index a3744e3174..f1cdee7086 100644 --- a/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_security_policy_rule_test.go b/google-beta/services/compute/resource_compute_security_policy_rule_test.go index 6dfe13dd95..f09c746924 100644 --- a/google-beta/services/compute/resource_compute_security_policy_rule_test.go +++ b/google-beta/services/compute/resource_compute_security_policy_rule_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeSecurityPolicyRule_basicUpdate(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_security_policy_test.go b/google-beta/services/compute/resource_compute_security_policy_test.go index 7c6b129d25..df7680031a 100644 --- a/google-beta/services/compute/resource_compute_security_policy_test.go +++ b/google-beta/services/compute/resource_compute_security_policy_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_service_attachment_generated_test.go b/google-beta/services/compute/resource_compute_service_attachment_generated_test.go index d7bc0b4523..505fd5223d 100644 --- a/google-beta/services/compute/resource_compute_service_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_service_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_service_attachment_test.go b/google-beta/services/compute/resource_compute_service_attachment_test.go index 2e779c7aa6..41a85bb9e5 100644 --- a/google-beta/services/compute/resource_compute_service_attachment_test.go +++ b/google-beta/services/compute/resource_compute_service_attachment_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_shared_reservation_update_test.go b/google-beta/services/compute/resource_compute_shared_reservation_update_test.go index 2617877d8f..dc5f67192b 100644 --- a/google-beta/services/compute/resource_compute_shared_reservation_update_test.go +++ b/google-beta/services/compute/resource_compute_shared_reservation_update_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_shared_vpc_test.go b/google-beta/services/compute/resource_compute_shared_vpc_test.go index cedcbeca45..7f48690277 100644 --- a/google-beta/services/compute/resource_compute_shared_vpc_test.go +++ b/google-beta/services/compute/resource_compute_shared_vpc_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_compute_snapshot_generated_test.go b/google-beta/services/compute/resource_compute_snapshot_generated_test.go index acf7160a44..da39575964 100644 --- a/google-beta/services/compute/resource_compute_snapshot_generated_test.go +++ b/google-beta/services/compute/resource_compute_snapshot_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_snapshot_test.go b/google-beta/services/compute/resource_compute_snapshot_test.go index c9db21e866..7c3dfbfd52 100644 --- a/google-beta/services/compute/resource_compute_snapshot_test.go +++ b/google-beta/services/compute/resource_compute_snapshot_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go b/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go index 005cf47856..00c0828a6a 100644 --- a/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go +++ b/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_ssl_certificate_test.go b/google-beta/services/compute/resource_compute_ssl_certificate_test.go index 0dcfba60d1..365da7ff4c 100644 --- a/google-beta/services/compute/resource_compute_ssl_certificate_test.go +++ b/google-beta/services/compute/resource_compute_ssl_certificate_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" ) diff --git a/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go b/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go index e95ff75f5c..a1dbcd75a7 100644 --- a/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_ssl_policy_test.go b/google-beta/services/compute/resource_compute_ssl_policy_test.go index e83665c6ea..f6ba229f54 100644 --- a/google-beta/services/compute/resource_compute_ssl_policy_test.go +++ b/google-beta/services/compute/resource_compute_ssl_policy_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_subnetwork_generated_test.go b/google-beta/services/compute/resource_compute_subnetwork_generated_test.go index 2fb53b3a8d..c673966f51 100644 --- a/google-beta/services/compute/resource_compute_subnetwork_generated_test.go +++ b/google-beta/services/compute/resource_compute_subnetwork_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_subnetwork_test.go b/google-beta/services/compute/resource_compute_subnetwork_test.go index e84c6d98f1..2aeaafe740 100644 --- a/google-beta/services/compute/resource_compute_subnetwork_test.go +++ b/google-beta/services/compute/resource_compute_subnetwork_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" diff --git a/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go index 116271655b..7357454049 100644 --- a/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_target_grpc_proxy_test.go b/google-beta/services/compute/resource_compute_target_grpc_proxy_test.go index cf60d2f7b3..c55ab70874 100644 --- a/google-beta/services/compute/resource_compute_target_grpc_proxy_test.go +++ b/google-beta/services/compute/resource_compute_target_grpc_proxy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go index fa4e65b4ec..bb0873257c 100644 --- a/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_target_http_proxy_test.go b/google-beta/services/compute/resource_compute_target_http_proxy_test.go index c93894cf20..5f4b60781f 100644 --- a/google-beta/services/compute/resource_compute_target_http_proxy_test.go +++ b/google-beta/services/compute/resource_compute_target_http_proxy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go index 4696c0c041..d25684c01f 100644 --- a/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_target_https_proxy_test.go b/google-beta/services/compute/resource_compute_target_https_proxy_test.go index ab6c31cf5a..d70e3c0379 100644 --- a/google-beta/services/compute/resource_compute_target_https_proxy_test.go +++ b/google-beta/services/compute/resource_compute_target_https_proxy_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_target_instance_generated_test.go b/google-beta/services/compute/resource_compute_target_instance_generated_test.go index 6f00a71cb1..f41a769127 100644 --- a/google-beta/services/compute/resource_compute_target_instance_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_target_instance_test.go b/google-beta/services/compute/resource_compute_target_instance_test.go index c28c32f893..07a811a321 100644 --- a/google-beta/services/compute/resource_compute_target_instance_test.go +++ b/google-beta/services/compute/resource_compute_target_instance_test.go @@ -5,7 +5,7 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_target_pool_test.go b/google-beta/services/compute/resource_compute_target_pool_test.go index be4efbf355..25dc90a177 100644 --- a/google-beta/services/compute/resource_compute_target_pool_test.go +++ b/google-beta/services/compute/resource_compute_target_pool_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go index 02ae45d884..fed8604ab1 100644 --- a/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_target_ssl_proxy_test.go b/google-beta/services/compute/resource_compute_target_ssl_proxy_test.go index 5ae917b80c..9a9405a287 100644 --- a/google-beta/services/compute/resource_compute_target_ssl_proxy_test.go +++ b/google-beta/services/compute/resource_compute_target_ssl_proxy_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" compute "google.golang.org/api/compute/v0.beta" ) diff --git a/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go index 3082ab2e33..a7d9d55367 100644 --- a/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_target_tcp_proxy_test.go b/google-beta/services/compute/resource_compute_target_tcp_proxy_test.go index 8b71d5fee9..de28f3ddd8 100644 --- a/google-beta/services/compute/resource_compute_target_tcp_proxy_test.go +++ b/google-beta/services/compute/resource_compute_target_tcp_proxy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/compute/resource_compute_url_map_generated_test.go b/google-beta/services/compute/resource_compute_url_map_generated_test.go index f924d1e1b4..1af3f2bd49 100644 --- a/google-beta/services/compute/resource_compute_url_map_generated_test.go +++ b/google-beta/services/compute/resource_compute_url_map_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_url_map_test.go b/google-beta/services/compute/resource_compute_url_map_test.go index b266150c8f..c809ae4177 100644 --- a/google-beta/services/compute/resource_compute_url_map_test.go +++ b/google-beta/services/compute/resource_compute_url_map_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccComputeUrlMap_update_path_matcher(t *testing.T) { diff --git a/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go b/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go index e7b607e466..e10e3fb197 100644 --- a/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go +++ b/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go b/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go index e37fd4a797..521182efd4 100644 --- a/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go +++ b/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/compute/resource_compute_vpn_tunnel_test.go b/google-beta/services/compute/resource_compute_vpn_tunnel_test.go index 3012fd8c37..0b0f7193bd 100644 --- a/google-beta/services/compute/resource_compute_vpn_tunnel_test.go +++ b/google-beta/services/compute/resource_compute_vpn_tunnel_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/compute/resource_usage_export_bucket_test.go b/google-beta/services/compute/resource_usage_export_bucket_test.go index 14ca663272..356009330e 100644 --- a/google-beta/services/compute/resource_usage_export_bucket_test.go +++ b/google-beta/services/compute/resource_usage_export_bucket_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/container/data_source_google_container_cluster_test.go b/google-beta/services/container/data_source_google_container_cluster_test.go index d698293c8d..97ed901336 100644 --- a/google-beta/services/container/data_source_google_container_cluster_test.go +++ b/google-beta/services/container/data_source_google_container_cluster_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/container/data_source_google_container_engine_versions_test.go b/google-beta/services/container/data_source_google_container_engine_versions_test.go index 5e7bb86cb9..b199b2c485 100644 --- a/google-beta/services/container/data_source_google_container_engine_versions_test.go +++ b/google-beta/services/container/data_source_google_container_engine_versions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/container/resource_container_cluster_test.go b/google-beta/services/container/resource_container_cluster_test.go index 5fd8bd64b0..e784d27ac3 100644 --- a/google-beta/services/container/resource_container_cluster_test.go +++ b/google-beta/services/container/resource_container_cluster_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/container" diff --git a/google-beta/services/container/resource_container_node_pool_test.go b/google-beta/services/container/resource_container_node_pool_test.go index 26b346d032..8610659ec1 100644 --- a/google-beta/services/container/resource_container_node_pool_test.go +++ b/google-beta/services/container/resource_container_node_pool_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/containeranalysis/data_source_container_registry_test.go b/google-beta/services/containeranalysis/data_source_container_registry_test.go index 8b711b10ad..fcd90deac1 100644 --- a/google-beta/services/containeranalysis/data_source_container_registry_test.go +++ b/google-beta/services/containeranalysis/data_source_container_registry_test.go @@ -5,7 +5,7 @@ package containeranalysis_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/containeranalysis/iam_container_analysis_note_generated_test.go b/google-beta/services/containeranalysis/iam_container_analysis_note_generated_test.go index 3f96a7bdf1..30b8ce5538 100644 --- a/google-beta/services/containeranalysis/iam_container_analysis_note_generated_test.go +++ b/google-beta/services/containeranalysis/iam_container_analysis_note_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go b/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go index 85b7295b70..29a0791618 100644 --- a/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go +++ b/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/containeranalysis/resource_container_analysis_note_test.go b/google-beta/services/containeranalysis/resource_container_analysis_note_test.go index a11884be75..ffddbb6998 100644 --- a/google-beta/services/containeranalysis/resource_container_analysis_note_test.go +++ b/google-beta/services/containeranalysis/resource_container_analysis_note_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/containeranalysis/resource_container_analysis_occurrence_test.go b/google-beta/services/containeranalysis/resource_container_analysis_occurrence_test.go index 3386319c8f..2ecebcc320 100644 --- a/google-beta/services/containeranalysis/resource_container_analysis_occurrence_test.go +++ b/google-beta/services/containeranalysis/resource_container_analysis_occurrence_test.go @@ -14,7 +14,7 @@ import ( "crypto/sha512" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "google.golang.org/api/cloudkms/v1" ) diff --git a/google-beta/services/containeranalysis/resource_container_registry_test.go b/google-beta/services/containeranalysis/resource_container_registry_test.go index 37368f95d7..6ed62b951b 100644 --- a/google-beta/services/containeranalysis/resource_container_registry_test.go +++ b/google-beta/services/containeranalysis/resource_container_registry_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/containerattached/data_source_google_container_attached_install_manifest_test.go b/google-beta/services/containerattached/data_source_google_container_attached_install_manifest_test.go index 5e09de5222..f0b87f3bee 100644 --- a/google-beta/services/containerattached/data_source_google_container_attached_install_manifest_test.go +++ b/google-beta/services/containerattached/data_source_google_container_attached_install_manifest_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/containerattached/data_source_google_container_attached_versions_test.go b/google-beta/services/containerattached/data_source_google_container_attached_versions_test.go index 9da53c1dcf..32e6ee5dd7 100644 --- a/google-beta/services/containerattached/data_source_google_container_attached_versions_test.go +++ b/google-beta/services/containerattached/data_source_google_container_attached_versions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go b/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go index 293379d097..d9333e4900 100644 --- a/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go +++ b/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/containerattached/resource_container_attached_cluster_update_test.go b/google-beta/services/containerattached/resource_container_attached_cluster_update_test.go index a490ab0408..954b0affe7 100644 --- a/google-beta/services/containerattached/resource_container_attached_cluster_update_test.go +++ b/google-beta/services/containerattached/resource_container_attached_cluster_update_test.go @@ -5,7 +5,7 @@ package containerattached_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/containeraws/resource_container_aws_cluster_generated_test.go b/google-beta/services/containeraws/resource_container_aws_cluster_generated_test.go index 8aee8eff5e..610b7a9f65 100644 --- a/google-beta/services/containeraws/resource_container_aws_cluster_generated_test.go +++ b/google-beta/services/containeraws/resource_container_aws_cluster_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" containeraws "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containeraws/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/containeraws/resource_container_aws_node_pool_generated_test.go b/google-beta/services/containeraws/resource_container_aws_node_pool_generated_test.go index 77b0a39407..d222037abe 100644 --- a/google-beta/services/containeraws/resource_container_aws_node_pool_generated_test.go +++ b/google-beta/services/containeraws/resource_container_aws_node_pool_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" containeraws "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containeraws/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/containerazure/resource_container_azure_client_generated_test.go b/google-beta/services/containerazure/resource_container_azure_client_generated_test.go index 8d512e78da..b6ab7ecdc4 100644 --- a/google-beta/services/containerazure/resource_container_azure_client_generated_test.go +++ b/google-beta/services/containerazure/resource_container_azure_client_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/containerazure/resource_container_azure_cluster_generated_test.go b/google-beta/services/containerazure/resource_container_azure_cluster_generated_test.go index a5890ba013..8f8060fef6 100644 --- a/google-beta/services/containerazure/resource_container_azure_cluster_generated_test.go +++ b/google-beta/services/containerazure/resource_container_azure_cluster_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/containerazure/resource_container_azure_node_pool_generated_test.go b/google-beta/services/containerazure/resource_container_azure_node_pool_generated_test.go index e156ed526a..05144e32e0 100644 --- a/google-beta/services/containerazure/resource_container_azure_node_pool_generated_test.go +++ b/google-beta/services/containerazure/resource_container_azure_node_pool_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/corebilling/resource_billing_project_info_generated_test.go b/google-beta/services/corebilling/resource_billing_project_info_generated_test.go index db64fa4554..bc3e8340dc 100644 --- a/google-beta/services/corebilling/resource_billing_project_info_generated_test.go +++ b/google-beta/services/corebilling/resource_billing_project_info_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/corebilling/resource_google_billing_project_info_test.go b/google-beta/services/corebilling/resource_google_billing_project_info_test.go index cc29e2fa42..25f3dd3d76 100644 --- a/google-beta/services/corebilling/resource_google_billing_project_info_test.go +++ b/google-beta/services/corebilling/resource_google_billing_project_info_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go b/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go index aa3ba47bc9..315176d2a5 100644 --- a/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go +++ b/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go b/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go index bcca8cd34e..74d42fb579 100644 --- a/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go +++ b/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDatabaseMigrationServiceConnectionProfile_update(t *testing.T) { diff --git a/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go b/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go index 1c0d711c50..0fc42dcae6 100644 --- a/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go +++ b/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datacatalog/iam_data_catalog_entry_group_generated_test.go b/google-beta/services/datacatalog/iam_data_catalog_entry_group_generated_test.go index 88df19161c..f7b2eb9779 100644 --- a/google-beta/services/datacatalog/iam_data_catalog_entry_group_generated_test.go +++ b/google-beta/services/datacatalog/iam_data_catalog_entry_group_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datacatalog/iam_data_catalog_policy_tag_generated_test.go b/google-beta/services/datacatalog/iam_data_catalog_policy_tag_generated_test.go index e5158c9f19..bda76405eb 100644 --- a/google-beta/services/datacatalog/iam_data_catalog_policy_tag_generated_test.go +++ b/google-beta/services/datacatalog/iam_data_catalog_policy_tag_generated_test.go @@ -20,7 +20,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datacatalog/iam_data_catalog_tag_template_generated_test.go b/google-beta/services/datacatalog/iam_data_catalog_tag_template_generated_test.go index c68618da7e..c420e98670 100644 --- a/google-beta/services/datacatalog/iam_data_catalog_tag_template_generated_test.go +++ b/google-beta/services/datacatalog/iam_data_catalog_tag_template_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datacatalog/iam_data_catalog_taxonomy_generated_test.go b/google-beta/services/datacatalog/iam_data_catalog_taxonomy_generated_test.go index e348d2cf31..e6f0ed2647 100644 --- a/google-beta/services/datacatalog/iam_data_catalog_taxonomy_generated_test.go +++ b/google-beta/services/datacatalog/iam_data_catalog_taxonomy_generated_test.go @@ -20,7 +20,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go index 70e50c2a79..a13007e11b 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go index 6eb8806c2d..1e3f850097 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datacatalog/resource_data_catalog_entry_group_test.go b/google-beta/services/datacatalog/resource_data_catalog_entry_group_test.go index 45da7d0a87..48c0a5e1e8 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_entry_group_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_entry_group_test.go @@ -5,7 +5,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datacatalog/resource_data_catalog_entry_test.go b/google-beta/services/datacatalog/resource_data_catalog_entry_test.go index 794897c0a4..6c76b78b06 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_entry_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_entry_test.go @@ -5,7 +5,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go index b7b6bfad5b..232076c13c 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go index 1a37ec7b7e..1ef468c9e1 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go index 8cd0ab2c2d..5baab36969 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datacatalog/resource_data_catalog_tag_template_test.go b/google-beta/services/datacatalog/resource_data_catalog_tag_template_test.go index d9f0ad41e1..be133d7245 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_tag_template_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_tag_template_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datacatalog/resource_data_catalog_tag_test.go b/google-beta/services/datacatalog/resource_data_catalog_tag_test.go index f8803f2a15..71b6366e0a 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_tag_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_tag_test.go @@ -5,7 +5,7 @@ package datacatalog_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go index cb6c84dfc6..70dbcbf98e 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go b/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go index 68c35df131..77158cf672 100644 --- a/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go +++ b/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataflow/resource_dataflow_job_test.go b/google-beta/services/dataflow/resource_dataflow_job_test.go index f9e9c997ca..520ab57750 100644 --- a/google-beta/services/dataflow/resource_dataflow_job_test.go +++ b/google-beta/services/dataflow/resource_dataflow_job_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataflow" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" diff --git a/google-beta/services/dataform/iam_dataform_repository_generated_test.go b/google-beta/services/dataform/iam_dataform_repository_generated_test.go index 28cacb6d0b..d4aadaf2e2 100644 --- a/google-beta/services/dataform/iam_dataform_repository_generated_test.go +++ b/google-beta/services/dataform/iam_dataform_repository_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataform/resource_dataform_repository_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_generated_test.go index 4a52374fdf..63883f3fe2 100644 --- a/google-beta/services/dataform/resource_dataform_repository_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go index f621bef7a8..72f26cbeca 100644 --- a/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataform/resource_dataform_repository_test.go b/google-beta/services/dataform/resource_dataform_repository_test.go index 52a61680a3..5014a8e362 100644 --- a/google-beta/services/dataform/resource_dataform_repository_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_test.go @@ -5,7 +5,7 @@ package dataform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go index 58a3f7a901..7761c8f004 100644 --- a/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datafusion/iam_data_fusion_instance_generated_test.go b/google-beta/services/datafusion/iam_data_fusion_instance_generated_test.go index 9d5d243642..6ca71718cd 100644 --- a/google-beta/services/datafusion/iam_data_fusion_instance_generated_test.go +++ b/google-beta/services/datafusion/iam_data_fusion_instance_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go b/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go index 3e3941fab4..0a79200fab 100644 --- a/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go +++ b/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datafusion/resource_data_fusion_instance_test.go b/google-beta/services/datafusion/resource_data_fusion_instance_test.go index 793fbe3bcd..b7370d27d1 100644 --- a/google-beta/services/datafusion/resource_data_fusion_instance_test.go +++ b/google-beta/services/datafusion/resource_data_fusion_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go index 105b5d9a35..abb3d6758d 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go index 7824d7cdb2..debf6d1746 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_test.go @@ -5,7 +5,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go index bda84ee3ba..ebdf78d1a2 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go index aa93763d5c..cc3213a7ea 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_test.go @@ -5,7 +5,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go index 1598b8d42a..b25463b5ce 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go index ae3a38b234..5fb31cb42c 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_test.go @@ -5,7 +5,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go index 6684ae99d5..cc727054f9 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go index 8de6556b8b..086e368463 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_test.go @@ -5,7 +5,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go index 9751f50f3c..c59c5ee379 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go index 5439705f18..acda255a20 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_test.go @@ -5,7 +5,7 @@ package datalossprevention_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go b/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go index b87e1f90f3..fca5444769 100644 --- a/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go +++ b/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datapipeline/resource_datapipeline_pipeline_test.go b/google-beta/services/datapipeline/resource_datapipeline_pipeline_test.go index 13b36cd321..4d8f8d6ee8 100644 --- a/google-beta/services/datapipeline/resource_datapipeline_pipeline_test.go +++ b/google-beta/services/datapipeline/resource_datapipeline_pipeline_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/dataplex/iam_dataplex_aspect_type_generated_test.go b/google-beta/services/dataplex/iam_dataplex_aspect_type_generated_test.go index 5372bcc252..38697bf182 100644 --- a/google-beta/services/dataplex/iam_dataplex_aspect_type_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_aspect_type_generated_test.go @@ -20,7 +20,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_asset_generated_test.go b/google-beta/services/dataplex/iam_dataplex_asset_generated_test.go index e281f53da8..87843af1f9 100644 --- a/google-beta/services/dataplex/iam_dataplex_asset_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_asset_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_datascan_generated_test.go b/google-beta/services/dataplex/iam_dataplex_datascan_generated_test.go index cbd7f5a5ff..0c556981da 100644 --- a/google-beta/services/dataplex/iam_dataplex_datascan_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_datascan_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_entry_group_generated_test.go b/google-beta/services/dataplex/iam_dataplex_entry_group_generated_test.go index bf731a4094..13b2d5dd94 100644 --- a/google-beta/services/dataplex/iam_dataplex_entry_group_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_entry_group_generated_test.go @@ -20,7 +20,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_entry_type_generated_test.go b/google-beta/services/dataplex/iam_dataplex_entry_type_generated_test.go index 429fa6af50..301d062eae 100644 --- a/google-beta/services/dataplex/iam_dataplex_entry_type_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_entry_type_generated_test.go @@ -20,7 +20,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_lake_generated_test.go b/google-beta/services/dataplex/iam_dataplex_lake_generated_test.go index a559568ab7..a7c3feca18 100644 --- a/google-beta/services/dataplex/iam_dataplex_lake_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_lake_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_task_generated_test.go b/google-beta/services/dataplex/iam_dataplex_task_generated_test.go index aa0af0ea12..15c681792f 100644 --- a/google-beta/services/dataplex/iam_dataplex_task_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_task_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/iam_dataplex_zone_generated_test.go b/google-beta/services/dataplex/iam_dataplex_zone_generated_test.go index cf19a63499..d57cd97bb5 100644 --- a/google-beta/services/dataplex/iam_dataplex_zone_generated_test.go +++ b/google-beta/services/dataplex/iam_dataplex_zone_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go b/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go index 99e23e9d85..da17554bd0 100644 --- a/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_aspect_type_test.go b/google-beta/services/dataplex/resource_dataplex_aspect_type_test.go index f575f50719..7e657f9bbe 100644 --- a/google-beta/services/dataplex/resource_dataplex_aspect_type_test.go +++ b/google-beta/services/dataplex/resource_dataplex_aspect_type_test.go @@ -5,7 +5,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_asset_generated_test.go b/google-beta/services/dataplex/resource_dataplex_asset_generated_test.go index e3a9ec1e53..6f4a2691a6 100644 --- a/google-beta/services/dataplex/resource_dataplex_asset_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_asset_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" dataplex "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataplex/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go b/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go index e1e6fc8da3..227d217ecf 100644 --- a/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go b/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go index fef4d4dfbf..0f243dfa82 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_group_test.go b/google-beta/services/dataplex/resource_dataplex_entry_group_test.go index 3edaf8d430..a7e219f62c 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_group_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_group_test.go @@ -5,7 +5,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go b/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go index 101b94110e..216aafca3c 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_type_test.go b/google-beta/services/dataplex/resource_dataplex_entry_type_test.go index 0f944d6578..514d11ea0f 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_type_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_type_test.go @@ -5,7 +5,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_lake_generated_test.go b/google-beta/services/dataplex/resource_dataplex_lake_generated_test.go index a6378c763a..7f711b224f 100644 --- a/google-beta/services/dataplex/resource_dataplex_lake_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_lake_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" dataplex "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataplex/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/dataplex/resource_dataplex_task_generated_test.go b/google-beta/services/dataplex/resource_dataplex_task_generated_test.go index 6a33485fe0..2c30dde932 100644 --- a/google-beta/services/dataplex/resource_dataplex_task_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_task_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_task_test.go b/google-beta/services/dataplex/resource_dataplex_task_test.go index 22f5382824..995b7b4a80 100644 --- a/google-beta/services/dataplex/resource_dataplex_task_test.go +++ b/google-beta/services/dataplex/resource_dataplex_task_test.go @@ -5,7 +5,7 @@ package dataplex_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataplex/resource_dataplex_zone_generated_test.go b/google-beta/services/dataplex/resource_dataplex_zone_generated_test.go index b691997763..8d429d25b4 100644 --- a/google-beta/services/dataplex/resource_dataplex_zone_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_zone_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" dataplex "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataplex/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/dataproc/iam_dataproc_autoscaling_policy_generated_test.go b/google-beta/services/dataproc/iam_dataproc_autoscaling_policy_generated_test.go index ea1a6f062b..4abc998f22 100644 --- a/google-beta/services/dataproc/iam_dataproc_autoscaling_policy_generated_test.go +++ b/google-beta/services/dataproc/iam_dataproc_autoscaling_policy_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataproc/iam_dataproc_cluster_test.go b/google-beta/services/dataproc/iam_dataproc_cluster_test.go index 81d63e09a5..4d23d5b8d9 100644 --- a/google-beta/services/dataproc/iam_dataproc_cluster_test.go +++ b/google-beta/services/dataproc/iam_dataproc_cluster_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dataproc/iam_dataproc_job_test.go b/google-beta/services/dataproc/iam_dataproc_job_test.go index 9b037e951d..02ccbf4bfb 100644 --- a/google-beta/services/dataproc/iam_dataproc_job_test.go +++ b/google-beta/services/dataproc/iam_dataproc_job_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go b/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go index 30555ca1da..1cfb7f6161 100644 --- a/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go +++ b/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataproc/resource_dataproc_cluster_test.go b/google-beta/services/dataproc/resource_dataproc_cluster_test.go index 92a6a16be8..d91062ffe0 100644 --- a/google-beta/services/dataproc/resource_dataproc_cluster_test.go +++ b/google-beta/services/dataproc/resource_dataproc_cluster_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataproc/resource_dataproc_cluster_upgrade_test.go b/google-beta/services/dataproc/resource_dataproc_cluster_upgrade_test.go index 4ee0fe187f..60d0511f14 100644 --- a/google-beta/services/dataproc/resource_dataproc_cluster_upgrade_test.go +++ b/google-beta/services/dataproc/resource_dataproc_cluster_upgrade_test.go @@ -5,7 +5,7 @@ package dataproc_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "google.golang.org/api/dataproc/v1" diff --git a/google-beta/services/dataproc/resource_dataproc_job_test.go b/google-beta/services/dataproc/resource_dataproc_job_test.go index bb41ada117..210d6b1c68 100644 --- a/google-beta/services/dataproc/resource_dataproc_job_test.go +++ b/google-beta/services/dataproc/resource_dataproc_job_test.go @@ -14,8 +14,8 @@ import ( // "regexp" "github.com/hashicorp/errwrap" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" tpgdataproc "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataproc/resource_dataproc_workflow_template_test.go b/google-beta/services/dataproc/resource_dataproc_workflow_template_test.go index e985d6c258..8d0c74e1f0 100644 --- a/google-beta/services/dataproc/resource_dataproc_workflow_template_test.go +++ b/google-beta/services/dataproc/resource_dataproc_workflow_template_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go b/google-beta/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go index 2d914f31dd..c3258cb845 100644 --- a/google-beta/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go +++ b/google-beta/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataprocMetastoreServiceDatasource_basic(t *testing.T) { diff --git a/google-beta/services/dataprocmetastore/iam_dataproc_metastore_service_generated_test.go b/google-beta/services/dataprocmetastore/iam_dataproc_metastore_service_generated_test.go index 577ff6c85a..57b986b325 100644 --- a/google-beta/services/dataprocmetastore/iam_dataproc_metastore_service_generated_test.go +++ b/google-beta/services/dataprocmetastore/iam_dataproc_metastore_service_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go index 758ee4a96a..b0bd2e59c3 100644 --- a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go +++ b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_test.go b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_test.go index f2c8ca07ac..69ad9b3c27 100644 --- a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_test.go +++ b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataprocMetastoreService_updateAndImport(t *testing.T) { diff --git a/google-beta/services/datastore/resource_datastore_index_generated_test.go b/google-beta/services/datastore/resource_datastore_index_generated_test.go index e1b104f7fc..59d8ac50f1 100644 --- a/google-beta/services/datastore/resource_datastore_index_generated_test.go +++ b/google-beta/services/datastore/resource_datastore_index_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/datastream/data_source_google_datastream_static_ips_test.go b/google-beta/services/datastream/data_source_google_datastream_static_ips_test.go index f80fbefc49..0755e84a18 100644 --- a/google-beta/services/datastream/data_source_google_datastream_static_ips_test.go +++ b/google-beta/services/datastream/data_source_google_datastream_static_ips_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go b/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go index 2cd0f41339..8805f710c5 100644 --- a/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go +++ b/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datastream/resource_datastream_connection_profile_test.go b/google-beta/services/datastream/resource_datastream_connection_profile_test.go index fa9568ef10..ceddfd1e4a 100644 --- a/google-beta/services/datastream/resource_datastream_connection_profile_test.go +++ b/google-beta/services/datastream/resource_datastream_connection_profile_test.go @@ -5,7 +5,7 @@ package datastream_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go b/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go index 16874224d9..11a503b30b 100644 --- a/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go +++ b/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datastream/resource_datastream_stream_generated_test.go b/google-beta/services/datastream/resource_datastream_stream_generated_test.go index c9edf9d741..d09d8ad030 100644 --- a/google-beta/services/datastream/resource_datastream_stream_generated_test.go +++ b/google-beta/services/datastream/resource_datastream_stream_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/datastream/resource_datastream_stream_test.go b/google-beta/services/datastream/resource_datastream_stream_test.go index d231b1b178..dac0ad6eb7 100644 --- a/google-beta/services/datastream/resource_datastream_stream_test.go +++ b/google-beta/services/datastream/resource_datastream_stream_test.go @@ -5,7 +5,7 @@ package datastream_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/deploymentmanager/resource_deployment_manager_deployment_test.go b/google-beta/services/deploymentmanager/resource_deployment_manager_deployment_test.go index 00b6b0f8d7..817053d43d 100644 --- a/google-beta/services/deploymentmanager/resource_deployment_manager_deployment_test.go +++ b/google-beta/services/deploymentmanager/resource_deployment_manager_deployment_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go index eb1d669258..2420abcf0b 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflow/resource_dialogflow_agent_test.go b/google-beta/services/dialogflow/resource_dialogflow_agent_test.go index faf0644c86..ca32f12206 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_agent_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_agent_test.go @@ -5,7 +5,7 @@ package dialogflow_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflow/resource_dialogflow_entity_type_test.go b/google-beta/services/dialogflow/resource_dialogflow_entity_type_test.go index 7a30041bb8..ddd30d9886 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_entity_type_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_entity_type_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowEntityType_update(t *testing.T) { diff --git a/google-beta/services/dialogflow/resource_dialogflow_fulfillment_test.go b/google-beta/services/dialogflow/resource_dialogflow_fulfillment_test.go index 45f1e1ae7d..af471c8f7a 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_fulfillment_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_fulfillment_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowFulfillment_update(t *testing.T) { diff --git a/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go index febd11556c..e6bc825b83 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dialogflow/resource_dialogflow_intent_test.go b/google-beta/services/dialogflow/resource_dialogflow_intent_test.go index 2be5252f60..f870816781 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_intent_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_intent_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowIntent_basic(t *testing.T) { diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go index 7af0e5d854..0e4dd2782e 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go index dd37346bc5..85b4028f0b 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go index 4fd44b850a..b26d4573fe 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go index 8fbda28aca..1c12f1491b 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go index 99801ca143..f277915035 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go index 032973acc5..d261f326f1 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go index 74d829d3b0..611255485d 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go index bcdb712139..89201e7c2f 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go index 3ccd7b9c97..b1695b30d1 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go index 28d296b1aa..cb73f41575 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXTestCase_update(t *testing.T) { diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go index 3afb160b2c..4fc305c3d6 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go index fbd478b36d..76970cfb03 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_agent_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_agent_test.go index faededfd1a..a47a9e8872 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_agent_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_agent_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXAgent_update(t *testing.T) { diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go index 9ffbcacaa4..f8f7d4fb09 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_entity_type_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_environment_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_environment_test.go index a51141d2df..903cb5f6c2 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_environment_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_environment_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowCXEnvironment_update(t *testing.T) { diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_flow_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_flow_test.go index d82e2e1429..85076a5a1e 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_flow_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_flow_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_intent_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_intent_test.go index f97f3a6ed2..9f1837b9d6 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_intent_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_intent_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_page_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_page_test.go index 1499a069f2..8be16425e3 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_page_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_page_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_version_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_version_test.go index 629c834eb5..c125cb0042 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_version_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_version_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dialogflowcx/resource_dialogflowcx_webhook_test.go b/google-beta/services/dialogflowcx/resource_dialogflowcx_webhook_test.go index 9f323a9f2c..9230fd6b61 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflowcx_webhook_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflowcx_webhook_test.go @@ -5,7 +5,7 @@ package dialogflowcx_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go index c274cb5ad5..72bca7cb64 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_test.go index d9556f2217..47baa5dee9 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_test.go @@ -3,7 +3,7 @@ package discoveryengine_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" ) diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go index a13da8a452..e57148cfcc 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_data_store_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_data_store_test.go index 37eaaeaf88..e57ffb1d08 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_data_store_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_data_store_test.go @@ -3,7 +3,7 @@ package discoveryengine_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" ) diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go index c76f4f2c46..1e4d929796 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_test.go index edf97c9d8a..8ba8ecbb10 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_test.go @@ -3,7 +3,7 @@ package discoveryengine_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" ) diff --git a/google-beta/services/dns/data_source_dns_key_test.go b/google-beta/services/dns/data_source_dns_key_test.go index 830504db47..c9a9861380 100644 --- a/google-beta/services/dns/data_source_dns_key_test.go +++ b/google-beta/services/dns/data_source_dns_key_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/dns/data_source_dns_managed_zone_test.go b/google-beta/services/dns/data_source_dns_managed_zone_test.go index aae485b5f9..6781308767 100644 --- a/google-beta/services/dns/data_source_dns_managed_zone_test.go +++ b/google-beta/services/dns/data_source_dns_managed_zone_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/dns/data_source_dns_managed_zones_test.go b/google-beta/services/dns/data_source_dns_managed_zones_test.go index 0147c761d5..e50cd74e19 100644 --- a/google-beta/services/dns/data_source_dns_managed_zones_test.go +++ b/google-beta/services/dns/data_source_dns_managed_zones_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/dns/data_source_dns_record_set_test.go b/google-beta/services/dns/data_source_dns_record_set_test.go index 285342e602..5dc6f657b9 100644 --- a/google-beta/services/dns/data_source_dns_record_set_test.go +++ b/google-beta/services/dns/data_source_dns_record_set_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/dns/iam_dns_managed_zone_generated_test.go b/google-beta/services/dns/iam_dns_managed_zone_generated_test.go index 9b3d39ede4..5b8817c442 100644 --- a/google-beta/services/dns/iam_dns_managed_zone_generated_test.go +++ b/google-beta/services/dns/iam_dns_managed_zone_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dns/resource_dns_managed_zone_generated_test.go b/google-beta/services/dns/resource_dns_managed_zone_generated_test.go index 8985f1dc2f..fe4363cc89 100644 --- a/google-beta/services/dns/resource_dns_managed_zone_generated_test.go +++ b/google-beta/services/dns/resource_dns_managed_zone_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dns/resource_dns_managed_zone_test.go b/google-beta/services/dns/resource_dns_managed_zone_test.go index b1eecfe6af..c5575c4c37 100644 --- a/google-beta/services/dns/resource_dns_managed_zone_test.go +++ b/google-beta/services/dns/resource_dns_managed_zone_test.go @@ -11,8 +11,8 @@ import ( transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/dns/v1" ) diff --git a/google-beta/services/dns/resource_dns_policy_generated_test.go b/google-beta/services/dns/resource_dns_policy_generated_test.go index 46dc1d8d41..51884d3950 100644 --- a/google-beta/services/dns/resource_dns_policy_generated_test.go +++ b/google-beta/services/dns/resource_dns_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dns/resource_dns_policy_test.go b/google-beta/services/dns/resource_dns_policy_test.go index c7814b7a4f..836fdcd34f 100644 --- a/google-beta/services/dns/resource_dns_policy_test.go +++ b/google-beta/services/dns/resource_dns_policy_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDNSPolicy_update(t *testing.T) { diff --git a/google-beta/services/dns/resource_dns_record_set_test.go b/google-beta/services/dns/resource_dns_record_set_test.go index 2bea1d86a9..d4df037961 100644 --- a/google-beta/services/dns/resource_dns_record_set_test.go +++ b/google-beta/services/dns/resource_dns_record_set_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/dns/resource_dns_response_policy_generated_test.go b/google-beta/services/dns/resource_dns_response_policy_generated_test.go index e31281a094..e9b08d092d 100644 --- a/google-beta/services/dns/resource_dns_response_policy_generated_test.go +++ b/google-beta/services/dns/resource_dns_response_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go b/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go index 94c056b627..f24d013417 100644 --- a/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go +++ b/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/dns/resource_dns_response_policy_rule_test.go b/google-beta/services/dns/resource_dns_response_policy_rule_test.go index cdb39c18c9..6eedd1e7e4 100644 --- a/google-beta/services/dns/resource_dns_response_policy_rule_test.go +++ b/google-beta/services/dns/resource_dns_response_policy_rule_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/dns/resource_dns_response_policy_test.go b/google-beta/services/dns/resource_dns_response_policy_test.go index ae8d5178a9..f3672d6225 100644 --- a/google-beta/services/dns/resource_dns_response_policy_test.go +++ b/google-beta/services/dns/resource_dns_response_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go b/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go index 4105e95c00..c1b0ef042b 100644 --- a/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go +++ b/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go @@ -20,7 +20,7 @@ package documentai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/documentai/resource_document_ai_processor_generated_test.go b/google-beta/services/documentai/resource_document_ai_processor_generated_test.go index dce888459f..a25cc1d466 100644 --- a/google-beta/services/documentai/resource_document_ai_processor_generated_test.go +++ b/google-beta/services/documentai/resource_document_ai_processor_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go b/google-beta/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go index 35f8c3d55a..3e521d6bae 100644 --- a/google-beta/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go +++ b/google-beta/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/edgecontainer/resource_edgecontainer_cluster_generated_test.go b/google-beta/services/edgecontainer/resource_edgecontainer_cluster_generated_test.go index 259e744b8f..773407676e 100644 --- a/google-beta/services/edgecontainer/resource_edgecontainer_cluster_generated_test.go +++ b/google-beta/services/edgecontainer/resource_edgecontainer_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go b/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go index 8c4900f860..1ab25c2297 100644 --- a/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go +++ b/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/essentialcontacts/resource_essential_contacts_contact_test.go b/google-beta/services/essentialcontacts/resource_essential_contacts_contact_test.go index e8eeb00a0e..338840c70a 100644 --- a/google-beta/services/essentialcontacts/resource_essential_contacts_contact_test.go +++ b/google-beta/services/essentialcontacts/resource_essential_contacts_contact_test.go @@ -5,7 +5,7 @@ package essentialcontacts_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/eventarc/resource_eventarc_channel_test.go b/google-beta/services/eventarc/resource_eventarc_channel_test.go index 5c207d0b36..a10f3167cc 100644 --- a/google-beta/services/eventarc/resource_eventarc_channel_test.go +++ b/google-beta/services/eventarc/resource_eventarc_channel_test.go @@ -14,8 +14,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go b/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go index 0e499395ab..209e62319e 100644 --- a/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go +++ b/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go @@ -14,8 +14,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go b/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go index a1033daeaf..f52080f6ef 100644 --- a/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go +++ b/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/eventarc/resource_eventarc_trigger_test.go b/google-beta/services/eventarc/resource_eventarc_trigger_test.go index 5fb047a615..b85d8ca7ee 100644 --- a/google-beta/services/eventarc/resource_eventarc_trigger_test.go +++ b/google-beta/services/eventarc/resource_eventarc_trigger_test.go @@ -14,8 +14,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/filestore/data_source_filestore_instance_test.go b/google-beta/services/filestore/data_source_filestore_instance_test.go index 1383796c74..d725022e2e 100644 --- a/google-beta/services/filestore/data_source_filestore_instance_test.go +++ b/google-beta/services/filestore/data_source_filestore_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/filestore/resource_filestore_backup_generated_test.go b/google-beta/services/filestore/resource_filestore_backup_generated_test.go index fee97e7c21..d0ffd5da8b 100644 --- a/google-beta/services/filestore/resource_filestore_backup_generated_test.go +++ b/google-beta/services/filestore/resource_filestore_backup_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/filestore/resource_filestore_backup_test.go b/google-beta/services/filestore/resource_filestore_backup_test.go index 986b1b3c0e..baeb19a1d6 100644 --- a/google-beta/services/filestore/resource_filestore_backup_test.go +++ b/google-beta/services/filestore/resource_filestore_backup_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/filestore/resource_filestore_instance_generated_test.go b/google-beta/services/filestore/resource_filestore_instance_generated_test.go index a803ea926b..e724b9cb5b 100644 --- a/google-beta/services/filestore/resource_filestore_instance_generated_test.go +++ b/google-beta/services/filestore/resource_filestore_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/filestore/resource_filestore_instance_test.go b/google-beta/services/filestore/resource_filestore_instance_test.go index d4e38cd361..34265d42dc 100644 --- a/google-beta/services/filestore/resource_filestore_instance_test.go +++ b/google-beta/services/filestore/resource_filestore_instance_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/filestore" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func testResourceFilestoreInstanceStateDataV0() map[string]interface{} { diff --git a/google-beta/services/filestore/resource_filestore_restore_test.go b/google-beta/services/filestore/resource_filestore_restore_test.go index 5505b45e29..cc262047d2 100644 --- a/google-beta/services/filestore/resource_filestore_restore_test.go +++ b/google-beta/services/filestore/resource_filestore_restore_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go b/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go index e84733df52..493c1eff43 100644 --- a/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go +++ b/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/firebase/data_source_google_firebase_android_app_config_test.go b/google-beta/services/firebase/data_source_google_firebase_android_app_config_test.go index 96aba56e04..f07399f528 100644 --- a/google-beta/services/firebase/data_source_google_firebase_android_app_config_test.go +++ b/google-beta/services/firebase/data_source_google_firebase_android_app_config_test.go @@ -4,8 +4,8 @@ package firebase_test import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" diff --git a/google-beta/services/firebase/data_source_google_firebase_android_app_test.go b/google-beta/services/firebase/data_source_google_firebase_android_app_test.go index 074e7fc3b5..e308efac7a 100644 --- a/google-beta/services/firebase/data_source_google_firebase_android_app_test.go +++ b/google-beta/services/firebase/data_source_google_firebase_android_app_test.go @@ -5,7 +5,7 @@ package firebase_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/firebase/data_source_google_firebase_apple_app_config_test.go b/google-beta/services/firebase/data_source_google_firebase_apple_app_config_test.go index 49df99c2e1..0ada957b01 100644 --- a/google-beta/services/firebase/data_source_google_firebase_apple_app_config_test.go +++ b/google-beta/services/firebase/data_source_google_firebase_apple_app_config_test.go @@ -4,8 +4,8 @@ package firebase_test import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" diff --git a/google-beta/services/firebase/data_source_google_firebase_apple_app_test.go b/google-beta/services/firebase/data_source_google_firebase_apple_app_test.go index a3f8392782..0eda3d8330 100644 --- a/google-beta/services/firebase/data_source_google_firebase_apple_app_test.go +++ b/google-beta/services/firebase/data_source_google_firebase_apple_app_test.go @@ -5,7 +5,7 @@ package firebase_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/firebase/data_source_google_firebase_web_app_test.go b/google-beta/services/firebase/data_source_google_firebase_web_app_test.go index e4d5479a1b..5b885a2b29 100644 --- a/google-beta/services/firebase/data_source_google_firebase_web_app_test.go +++ b/google-beta/services/firebase/data_source_google_firebase_web_app_test.go @@ -5,7 +5,7 @@ package firebase_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/firebase/resource_firebase_android_app_generated_test.go b/google-beta/services/firebase/resource_firebase_android_app_generated_test.go index e9311d32d4..58707fc766 100644 --- a/google-beta/services/firebase/resource_firebase_android_app_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_android_app_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebase/resource_firebase_android_app_update_test.go b/google-beta/services/firebase/resource_firebase_android_app_update_test.go index ed1d5515be..f9e9b90670 100644 --- a/google-beta/services/firebase/resource_firebase_android_app_update_test.go +++ b/google-beta/services/firebase/resource_firebase_android_app_update_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseAndroidApp_update(t *testing.T) { diff --git a/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go b/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go index 11ec39929a..aeadcc0db5 100644 --- a/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebase/resource_firebase_apple_app_update_test.go b/google-beta/services/firebase/resource_firebase_apple_app_update_test.go index 309e70dba8..c83d06f8f4 100644 --- a/google-beta/services/firebase/resource_firebase_apple_app_update_test.go +++ b/google-beta/services/firebase/resource_firebase_apple_app_update_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseAppleApp_update(t *testing.T) { diff --git a/google-beta/services/firebase/resource_firebase_project_generated_test.go b/google-beta/services/firebase/resource_firebase_project_generated_test.go index 1a8592950c..87634e7eb3 100644 --- a/google-beta/services/firebase/resource_firebase_project_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_project_generated_test.go @@ -20,7 +20,7 @@ package firebase_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebase/resource_firebase_project_test.go b/google-beta/services/firebase/resource_firebase_project_test.go index 4d3f8e23a6..a5530bd836 100644 --- a/google-beta/services/firebase/resource_firebase_project_test.go +++ b/google-beta/services/firebase/resource_firebase_project_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseProject_destroyAndReapply(t *testing.T) { diff --git a/google-beta/services/firebase/resource_firebase_web_app_generated_test.go b/google-beta/services/firebase/resource_firebase_web_app_generated_test.go index 469b3cee8a..5bcd7da04e 100644 --- a/google-beta/services/firebase/resource_firebase_web_app_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_web_app_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebase/resource_firebase_web_app_test.go b/google-beta/services/firebase/resource_firebase_web_app_test.go index 7cfec897bd..3a7f438dc6 100644 --- a/google-beta/services/firebase/resource_firebase_web_app_test.go +++ b/google-beta/services/firebase/resource_firebase_web_app_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go index f9ddf0a1df..0cdcc95a9c 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go @@ -20,7 +20,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go index f50002bcf5..480ff335be 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go index 2852171211..c03e0db75b 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go index 8180626a54..5d3a33b123 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go index 6f17a26c12..ca909585e7 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go @@ -20,7 +20,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go index e0932b5e40..8ea4ded4aa 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go index 8ae4de1b6e..454ac77094 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go @@ -20,7 +20,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go index 99a6b7d81e..e69aba93ce 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go index da7e531ade..8596ae92cb 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go @@ -20,7 +20,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go index 73a25b461e..5359c5486b 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go index 9aa5a48c9c..7b84626881 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go @@ -20,7 +20,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go index 86bd28d682..fa9855641c 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go @@ -5,7 +5,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go index 8efbd82d48..bff184074f 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go index 493eafe6f3..82e138fa0a 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go @@ -7,7 +7,7 @@ package firebaseappcheck_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go b/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go index cea5a8b321..4aaa57866b 100644 --- a/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go +++ b/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasedatabase/resource_firebase_database_instance_test.go b/google-beta/services/firebasedatabase/resource_firebase_database_instance_test.go index f405e6524a..3bbe4fdef2 100644 --- a/google-beta/services/firebasedatabase/resource_firebase_database_instance_test.go +++ b/google-beta/services/firebasedatabase/resource_firebase_database_instance_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func testAccFirebaseDatabaseInstance_firebaseDatabaseInstanceInState(context map[string]interface{}, state string) string { diff --git a/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go b/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go index 631f04febe..cac5cc91b4 100644 --- a/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go +++ b/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_test.go b/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_test.go index d5aadcf8d7..77ebe81310 100644 --- a/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_test.go +++ b/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_test.go @@ -5,7 +5,7 @@ package firebaseextensions_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go b/google-beta/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go index d1d5a06420..c35d2ba81c 100644 --- a/google-beta/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go +++ b/google-beta/services/firebasehosting/data_source_google_firebase_hosting_channel_test.go @@ -5,7 +5,7 @@ package firebasehosting_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go index 6fe12297f4..06aeb8dc92 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_channel_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_channel_test.go index 737e2f153f..c19ccbf6df 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_channel_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_channel_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) { diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go index 03232652e9..7c111959fb 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go index 3bc4edd954..9ed1ad5176 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingCustomDomain_firebasehostingCustomdomainUpdate(t *testing.T) { diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go index acf475f722..bec8acc3b4 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go @@ -20,7 +20,7 @@ package firebasehosting_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go index 794f48da85..91796aca62 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_site_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_site_test.go index 7195e8593d..b65fa28351 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_site_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_site_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirebaseHostingSite_firebasehostingSiteUpdate(t *testing.T) { diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go index 98fd0d6276..e3fd79e7f0 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go @@ -20,7 +20,7 @@ package firebasehosting_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firebaserules/resource_firebaserules_release_generated_test.go b/google-beta/services/firebaserules/resource_firebaserules_release_generated_test.go index 1985a552cd..65287e4dc4 100644 --- a/google-beta/services/firebaserules/resource_firebaserules_release_generated_test.go +++ b/google-beta/services/firebaserules/resource_firebaserules_release_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" firebaserules "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/firebaserules/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/firebaserules/resource_firebaserules_ruleset_generated_test.go b/google-beta/services/firebaserules/resource_firebaserules_ruleset_generated_test.go index 4e91202224..d62b3b3ab7 100644 --- a/google-beta/services/firebaserules/resource_firebaserules_ruleset_generated_test.go +++ b/google-beta/services/firebaserules/resource_firebaserules_ruleset_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" firebaserules "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/firebaserules/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go b/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go index 1d802e356f..c3306370c4 100644 --- a/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go +++ b/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go b/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go index 43cad9828d..e5413bde3d 100644 --- a/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firestore/resource_firestore_database_generated_test.go b/google-beta/services/firestore/resource_firestore_database_generated_test.go index c840f07b15..b411131eeb 100644 --- a/google-beta/services/firestore/resource_firestore_database_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_database_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firestore/resource_firestore_database_update_test.go b/google-beta/services/firestore/resource_firestore_database_update_test.go index 07a0094150..37cb2b600d 100644 --- a/google-beta/services/firestore/resource_firestore_database_update_test.go +++ b/google-beta/services/firestore/resource_firestore_database_update_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccFirestoreDatabase_updateConcurrencyMode(t *testing.T) { diff --git a/google-beta/services/firestore/resource_firestore_document_generated_test.go b/google-beta/services/firestore/resource_firestore_document_generated_test.go index c67e247968..11beeb6430 100644 --- a/google-beta/services/firestore/resource_firestore_document_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_document_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/firestore/resource_firestore_document_test.go b/google-beta/services/firestore/resource_firestore_document_test.go index 3b3998b23f..69fb36f877 100644 --- a/google-beta/services/firestore/resource_firestore_document_test.go +++ b/google-beta/services/firestore/resource_firestore_document_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/firestore/resource_firestore_field_generated_test.go b/google-beta/services/firestore/resource_firestore_field_generated_test.go index 05b5bc95ed..894e78efbc 100644 --- a/google-beta/services/firestore/resource_firestore_field_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_field_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/googleapi" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" diff --git a/google-beta/services/firestore/resource_firestore_field_test.go b/google-beta/services/firestore/resource_firestore_field_test.go index 5b8c2c49cb..3a55491881 100644 --- a/google-beta/services/firestore/resource_firestore_field_test.go +++ b/google-beta/services/firestore/resource_firestore_field_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/firestore/resource_firestore_index_generated_test.go b/google-beta/services/firestore/resource_firestore_index_generated_test.go index 037d63a081..4ae97191dc 100644 --- a/google-beta/services/firestore/resource_firestore_index_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_index_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkebackup/iam_gke_backup_backup_plan_generated_test.go b/google-beta/services/gkebackup/iam_gke_backup_backup_plan_generated_test.go index b471814818..73b8b2df81 100644 --- a/google-beta/services/gkebackup/iam_gke_backup_backup_plan_generated_test.go +++ b/google-beta/services/gkebackup/iam_gke_backup_backup_plan_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkebackup/iam_gke_backup_restore_plan_generated_test.go b/google-beta/services/gkebackup/iam_gke_backup_restore_plan_generated_test.go index 94ed128cd5..0785175491 100644 --- a/google-beta/services/gkebackup/iam_gke_backup_restore_plan_generated_test.go +++ b/google-beta/services/gkebackup/iam_gke_backup_restore_plan_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go b/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go index 03d3f2d503..50b84e9911 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkebackup/resource_gke_backup_backup_plan_test.go b/google-beta/services/gkebackup/resource_gke_backup_backup_plan_test.go index d5e597a57d..c4550397fa 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_backup_plan_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_backup_plan_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccGKEBackupBackupPlan_update(t *testing.T) { diff --git a/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go b/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go index 7141eb7100..7ff2808ccf 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkebackup/resource_gke_backup_restore_plan_test.go b/google-beta/services/gkebackup/resource_gke_backup_restore_plan_test.go index 5b45efa824..9a15bdd327 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_restore_plan_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_restore_plan_test.go @@ -5,7 +5,7 @@ package gkebackup_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/gkehub/iam_gke_hub_membership_generated_test.go b/google-beta/services/gkehub/iam_gke_hub_membership_generated_test.go index 00b3507163..4a4e391fe5 100644 --- a/google-beta/services/gkehub/iam_gke_hub_membership_generated_test.go +++ b/google-beta/services/gkehub/iam_gke_hub_membership_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub/resource_gke_hub_feature_membership_test.go b/google-beta/services/gkehub/resource_gke_hub_feature_membership_test.go index d8ae6567bd..ea8fda17ea 100644 --- a/google-beta/services/gkehub/resource_gke_hub_feature_membership_test.go +++ b/google-beta/services/gkehub/resource_gke_hub_feature_membership_test.go @@ -10,8 +10,8 @@ import ( dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go b/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go index c956e407d6..12de97e25a 100644 --- a/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go +++ b/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go b/google-beta/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go index 3ce88d3462..1d4e11d2a5 100644 --- a/google-beta/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go +++ b/google-beta/services/gkehub2/data_source_google_gke_hub_membership_binding_test.go @@ -5,7 +5,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/gkehub2/iam_gke_hub_feature_test.go b/google-beta/services/gkehub2/iam_gke_hub_feature_test.go index 138defc456..a8307eaa75 100644 --- a/google-beta/services/gkehub2/iam_gke_hub_feature_test.go +++ b/google-beta/services/gkehub2/iam_gke_hub_feature_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/iam_gke_hub_scope_generated_test.go b/google-beta/services/gkehub2/iam_gke_hub_scope_generated_test.go index bc3fd139f2..5fd937f1c8 100644 --- a/google-beta/services/gkehub2/iam_gke_hub_scope_generated_test.go +++ b/google-beta/services/gkehub2/iam_gke_hub_scope_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_feature_test.go b/google-beta/services/gkehub2/resource_gke_hub_feature_test.go index b26810b07e..7ccd3c6cb1 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_feature_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_feature_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_fleet_test.go b/google-beta/services/gkehub2/resource_gke_hub_fleet_test.go index d0b5ca3367..0bb6b340ef 100755 --- a/google-beta/services/gkehub2/resource_gke_hub_fleet_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_fleet_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go index 6d62f70469..6d065dea78 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_membership_binding_test.go b/google-beta/services/gkehub2/resource_gke_hub_membership_binding_test.go index debeaf2222..1e06c6caf0 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_membership_binding_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_membership_binding_test.go @@ -5,7 +5,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go index 55f876d09f..ee5acdab53 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go index 9df733fa86..2c97bf8359 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_namespace_test.go b/google-beta/services/gkehub2/resource_gke_hub_namespace_test.go index 4eb4a0b980..90fe91520c 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_namespace_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_namespace_test.go @@ -5,7 +5,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go index 4cebe620c2..dcead6452e 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go index a4170218aa..c591a25f92 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go b/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go index 700ed403cf..0d427dfb0c 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go @@ -5,7 +5,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkehub2/resource_gke_hub_scope_test.go b/google-beta/services/gkehub2/resource_gke_hub_scope_test.go index 85a6b81747..e3983c9032 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_scope_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_scope_test.go @@ -5,7 +5,7 @@ package gkehub2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go index a0817adaf8..18e7074e8e 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go @@ -20,7 +20,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go index 343455847f..34ecf17e43 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go index 1aeef20407..9a4805fba4 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go @@ -5,7 +5,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go index 1962fb9412..0a8a299ba1 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go index 9dd408bec0..bdf8bb3a6c 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go @@ -5,7 +5,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go index 4c9a1ff8ec..ab56d3dcac 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go index e3f01098ba..2b4ae4a074 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go @@ -5,7 +5,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go index 762e92ab40..5122c54ec2 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go index 3d7ba7b411..4c79490da7 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go @@ -5,7 +5,7 @@ package gkeonprem_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/healthcare/iam_healthcare_consent_store_generated_test.go b/google-beta/services/healthcare/iam_healthcare_consent_store_generated_test.go index 9a4841598b..727bf9cded 100644 --- a/google-beta/services/healthcare/iam_healthcare_consent_store_generated_test.go +++ b/google-beta/services/healthcare/iam_healthcare_consent_store_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/healthcare/iam_healthcare_dataset_test.go b/google-beta/services/healthcare/iam_healthcare_dataset_test.go index 5fa2c1d9e6..c3369f5bae 100644 --- a/google-beta/services/healthcare/iam_healthcare_dataset_test.go +++ b/google-beta/services/healthcare/iam_healthcare_dataset_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) const DEFAULT_HEALTHCARE_TEST_LOCATION = "us-central1" diff --git a/google-beta/services/healthcare/iam_healthcare_dicom_store_test.go b/google-beta/services/healthcare/iam_healthcare_dicom_store_test.go index ed7cc5cd2f..826a74f7b6 100644 --- a/google-beta/services/healthcare/iam_healthcare_dicom_store_test.go +++ b/google-beta/services/healthcare/iam_healthcare_dicom_store_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareDicomStoreIamBinding(t *testing.T) { diff --git a/google-beta/services/healthcare/iam_healthcare_fhir_store_test.go b/google-beta/services/healthcare/iam_healthcare_fhir_store_test.go index 16f8c4cbba..ec6f4ca6c2 100644 --- a/google-beta/services/healthcare/iam_healthcare_fhir_store_test.go +++ b/google-beta/services/healthcare/iam_healthcare_fhir_store_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareFhirStoreIamBinding(t *testing.T) { diff --git a/google-beta/services/healthcare/iam_healthcare_hl7_v2_store_test.go b/google-beta/services/healthcare/iam_healthcare_hl7_v2_store_test.go index 3d8a4a2613..05ffa41cec 100644 --- a/google-beta/services/healthcare/iam_healthcare_hl7_v2_store_test.go +++ b/google-beta/services/healthcare/iam_healthcare_hl7_v2_store_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareHl7V2StoreIamBinding(t *testing.T) { diff --git a/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go index f4eb0414e1..77782988be 100644 --- a/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go b/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go index a253ecc544..1867950fa9 100644 --- a/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/healthcare/resource_healthcare_dataset_test.go b/google-beta/services/healthcare/resource_healthcare_dataset_test.go index e9c38c7b1b..61d90a9b9e 100644 --- a/google-beta/services/healthcare/resource_healthcare_dataset_test.go +++ b/google-beta/services/healthcare/resource_healthcare_dataset_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go index 8a796b0e96..1a0aa0dce2 100644 --- a/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/healthcare/resource_healthcare_dicom_store_test.go b/google-beta/services/healthcare/resource_healthcare_dicom_store_test.go index 1bc381e0d0..f1d31f8494 100644 --- a/google-beta/services/healthcare/resource_healthcare_dicom_store_test.go +++ b/google-beta/services/healthcare/resource_healthcare_dicom_store_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareDicomStoreIdParsing(t *testing.T) { diff --git a/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go index 65313a4b39..f9c79d1095 100644 --- a/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/healthcare/resource_healthcare_fhir_store_test.go b/google-beta/services/healthcare/resource_healthcare_fhir_store_test.go index f1aa8a05cd..1e0e6486a6 100644 --- a/google-beta/services/healthcare/resource_healthcare_fhir_store_test.go +++ b/google-beta/services/healthcare/resource_healthcare_fhir_store_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccHealthcareFhirStoreIdParsing(t *testing.T) { diff --git a/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go index 0e03d86878..5cfaa03559 100644 --- a/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_test.go b/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_test.go index 8c6fed59cf..07ca7a023c 100644 --- a/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_test.go +++ b/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_test.go @@ -7,8 +7,8 @@ import ( "path" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" diff --git a/google-beta/services/iam2/resource_iam_access_boundary_policy_test.go b/google-beta/services/iam2/resource_iam_access_boundary_policy_test.go index 81dc7c1243..e50ca9d42f 100644 --- a/google-beta/services/iam2/resource_iam_access_boundary_policy_test.go +++ b/google-beta/services/iam2/resource_iam_access_boundary_policy_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go b/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go index 08c2f966d9..484505a8b3 100644 --- a/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go +++ b/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iam2/resource_iam_deny_policy_test.go b/google-beta/services/iam2/resource_iam_deny_policy_test.go index f88fe55369..be57312aca 100644 --- a/google-beta/services/iam2/resource_iam_deny_policy_test.go +++ b/google-beta/services/iam2/resource_iam_deny_policy_test.go @@ -8,7 +8,7 @@ import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAM2DenyPolicy_iamDenyPolicyUpdate(t *testing.T) { diff --git a/google-beta/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go b/google-beta/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go index 7311f855ea..6ba0b73f36 100644 --- a/google-beta/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go +++ b/google-beta/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIAMBetaWorkloadIdentityPoolProvider_basic(t *testing.T) { diff --git a/google-beta/services/iambeta/data_source_iam_workload_identity_pool_test.go b/google-beta/services/iambeta/data_source_iam_workload_identity_pool_test.go index 56baf9b092..70268b8c36 100644 --- a/google-beta/services/iambeta/data_source_iam_workload_identity_pool_test.go +++ b/google-beta/services/iambeta/data_source_iam_workload_identity_pool_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceIAMBetaWorkloadIdentityPool_basic(t *testing.T) { diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go index 282b1fac1d..1061005dc0 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go index 574fb20345..4d941ceffd 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_test.go index 2bb5e6137f..4809383c46 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAMBetaWorkloadIdentityPoolProvider_aws(t *testing.T) { diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_test.go index 0ce77f8725..17f8f98ad2 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccIAMBetaWorkloadIdentityPool_full(t *testing.T) { diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go index a563227ae3..fe17c7515f 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go index 846457b878..71893c858f 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go index bba72bf913..6b9679dc92 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_test.go @@ -6,9 +6,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_test.go index 814ffe9d54..3130f63775 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_test.go @@ -3,7 +3,7 @@ package iamworkforcepool_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" diff --git a/google-beta/services/iap/data_source_iap_client_test.go b/google-beta/services/iap/data_source_iap_client_test.go index 138f03ce61..bb48f5078c 100644 --- a/google-beta/services/iap/data_source_iap_client_test.go +++ b/google-beta/services/iap/data_source_iap_client_test.go @@ -5,7 +5,7 @@ package iap_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/iap/iam_iap_app_engine_service_generated_test.go b/google-beta/services/iap/iam_iap_app_engine_service_generated_test.go index bfa3f21107..10acf7dee6 100644 --- a/google-beta/services/iap/iam_iap_app_engine_service_generated_test.go +++ b/google-beta/services/iap/iam_iap_app_engine_service_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_app_engine_version_generated_test.go b/google-beta/services/iap/iam_iap_app_engine_version_generated_test.go index 4face54dee..2e87419e17 100644 --- a/google-beta/services/iap/iam_iap_app_engine_version_generated_test.go +++ b/google-beta/services/iap/iam_iap_app_engine_version_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_tunnel_dest_group_generated_test.go b/google-beta/services/iap/iam_iap_tunnel_dest_group_generated_test.go index 5e62f84134..923fdda98b 100644 --- a/google-beta/services/iap/iam_iap_tunnel_dest_group_generated_test.go +++ b/google-beta/services/iap/iam_iap_tunnel_dest_group_generated_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/iap/iam_iap_tunnel_generated_test.go b/google-beta/services/iap/iam_iap_tunnel_generated_test.go index 7327f90156..2fb4e555b4 100644 --- a/google-beta/services/iap/iam_iap_tunnel_generated_test.go +++ b/google-beta/services/iap/iam_iap_tunnel_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_tunnel_instance_generated_test.go b/google-beta/services/iap/iam_iap_tunnel_instance_generated_test.go index 2098cd72e1..4fa3eb9b2f 100644 --- a/google-beta/services/iap/iam_iap_tunnel_instance_generated_test.go +++ b/google-beta/services/iap/iam_iap_tunnel_instance_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_web_backend_service_generated_test.go b/google-beta/services/iap/iam_iap_web_backend_service_generated_test.go index 79c595d2cb..dcc9f55167 100644 --- a/google-beta/services/iap/iam_iap_web_backend_service_generated_test.go +++ b/google-beta/services/iap/iam_iap_web_backend_service_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_web_generated_test.go b/google-beta/services/iap/iam_iap_web_generated_test.go index cef58c6729..8b6d20ac66 100644 --- a/google-beta/services/iap/iam_iap_web_generated_test.go +++ b/google-beta/services/iap/iam_iap_web_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_web_region_backend_service_generated_test.go b/google-beta/services/iap/iam_iap_web_region_backend_service_generated_test.go index 19be1c54f1..444f79b5ec 100644 --- a/google-beta/services/iap/iam_iap_web_region_backend_service_generated_test.go +++ b/google-beta/services/iap/iam_iap_web_region_backend_service_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_web_type_app_engine_generated_test.go b/google-beta/services/iap/iam_iap_web_type_app_engine_generated_test.go index 70700f5046..b822e8ea9a 100644 --- a/google-beta/services/iap/iam_iap_web_type_app_engine_generated_test.go +++ b/google-beta/services/iap/iam_iap_web_type_app_engine_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/iam_iap_web_type_compute_generated_test.go b/google-beta/services/iap/iam_iap_web_type_compute_generated_test.go index 1539b9bd55..293c29afdd 100644 --- a/google-beta/services/iap/iam_iap_web_type_compute_generated_test.go +++ b/google-beta/services/iap/iam_iap_web_type_compute_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/resource_iap_brand_test.go b/google-beta/services/iap/resource_iap_brand_test.go index ae63b1299b..fbda5a2d85 100644 --- a/google-beta/services/iap/resource_iap_brand_test.go +++ b/google-beta/services/iap/resource_iap_brand_test.go @@ -5,7 +5,7 @@ package iap_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/iap/resource_iap_client_generated_test.go b/google-beta/services/iap/resource_iap_client_generated_test.go index 9e9b6cc036..f552bef25e 100644 --- a/google-beta/services/iap/resource_iap_client_generated_test.go +++ b/google-beta/services/iap/resource_iap_client_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go b/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go index 45e82487a6..82f6f1a4eb 100644 --- a/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go +++ b/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/iap/resource_iap_tunnel_dest_group_test.go b/google-beta/services/iap/resource_iap_tunnel_dest_group_test.go index 2c9c99cb67..0177ba6fd1 100644 --- a/google-beta/services/iap/resource_iap_tunnel_dest_group_test.go +++ b/google-beta/services/iap/resource_iap_tunnel_dest_group_test.go @@ -5,7 +5,7 @@ package iap_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go index 1a47640311..5e4dca706b 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/identityplatform/resource_identity_platform_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_config_test.go index 26e80f6390..23208ac330 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go index 5188979fab..4e9423af4b 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_default_supported_idp_config_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go index 92472e7238..4e5255a28b 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go index 5b971110c6..0425b88e5f 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_test.go @@ -5,7 +5,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go index 928784bbf2..29b0e2436f 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go index 75379b619a..a41ea089c8 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_test.go @@ -5,7 +5,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go index afff998b56..3db089ba4e 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go index 977d6c198b..ab0c1e726a 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_test.go @@ -5,7 +5,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go index a3cbf3baa0..11e523f2b9 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go index 48f854cc45..89f3e579c5 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go index 4bebd7c732..d703d2b285 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_test.go @@ -5,7 +5,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go index 5c89fed958..831e70c862 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go index 57cdfc2fec..150207d751 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_test.go @@ -5,7 +5,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_test.go index 9e9c2dbc03..adf21a53e7 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_test.go @@ -5,7 +5,7 @@ package identityplatform_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_connection_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_connection_test.go index 270f067edb..160b475fab 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_connection_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_connection_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go index 9299e58b53..705297e7b9 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go index e94c5ec4c0..fcc3269488 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_test.go @@ -5,7 +5,7 @@ package integrationconnectors_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go index 15e7655af2..670e9734cb 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go index 378a6e55f9..694c8a426d 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go @@ -5,7 +5,7 @@ package integrationconnectors_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go b/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go index f346fee513..89e6c4e56d 100644 --- a/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go +++ b/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/integrations/resource_integrations_auth_config_test.go b/google-beta/services/integrations/resource_integrations_auth_config_test.go index 2d7dfb73d3..cc249b4570 100644 --- a/google-beta/services/integrations/resource_integrations_auth_config_test.go +++ b/google-beta/services/integrations/resource_integrations_auth_config_test.go @@ -5,7 +5,7 @@ package integrations_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/integrations/resource_integrations_client_generated_test.go b/google-beta/services/integrations/resource_integrations_client_generated_test.go index ff93b3d238..dfa95089a7 100644 --- a/google-beta/services/integrations/resource_integrations_client_generated_test.go +++ b/google-beta/services/integrations/resource_integrations_client_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/kms/data_source_google_kms_crypto_key_test.go b/google-beta/services/kms/data_source_google_kms_crypto_key_test.go index 8318f80ec1..3879b9237e 100644 --- a/google-beta/services/kms/data_source_google_kms_crypto_key_test.go +++ b/google-beta/services/kms/data_source_google_kms_crypto_key_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/data_source_google_kms_crypto_key_version_test.go b/google-beta/services/kms/data_source_google_kms_crypto_key_version_test.go index 2b0e3cb7be..a1171f1fd1 100644 --- a/google-beta/services/kms/data_source_google_kms_crypto_key_version_test.go +++ b/google-beta/services/kms/data_source_google_kms_crypto_key_version_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/data_source_google_kms_crypto_keys_test.go b/google-beta/services/kms/data_source_google_kms_crypto_keys_test.go index 9ebb358b67..32c6758bd2 100644 --- a/google-beta/services/kms/data_source_google_kms_crypto_keys_test.go +++ b/google-beta/services/kms/data_source_google_kms_crypto_keys_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/data_source_google_kms_key_ring_test.go b/google-beta/services/kms/data_source_google_kms_key_ring_test.go index 4519890b99..d0dd47b1ce 100644 --- a/google-beta/services/kms/data_source_google_kms_key_ring_test.go +++ b/google-beta/services/kms/data_source_google_kms_key_ring_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/data_source_google_kms_key_rings_test.go b/google-beta/services/kms/data_source_google_kms_key_rings_test.go index 1ae8a9c470..9d4fa18fda 100644 --- a/google-beta/services/kms/data_source_google_kms_key_rings_test.go +++ b/google-beta/services/kms/data_source_google_kms_key_rings_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/data_source_google_kms_secret_asymmetric_test.go b/google-beta/services/kms/data_source_google_kms_secret_asymmetric_test.go index ac456cb5e7..9578db1d74 100644 --- a/google-beta/services/kms/data_source_google_kms_secret_asymmetric_test.go +++ b/google-beta/services/kms/data_source_google_kms_secret_asymmetric_test.go @@ -14,8 +14,8 @@ import ( "log" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/kms/data_source_google_kms_secret_ciphertext_test.go b/google-beta/services/kms/data_source_google_kms_secret_ciphertext_test.go index 0edabe56bf..368edabccb 100644 --- a/google-beta/services/kms/data_source_google_kms_secret_ciphertext_test.go +++ b/google-beta/services/kms/data_source_google_kms_secret_ciphertext_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/data_source_google_kms_secret_test.go b/google-beta/services/kms/data_source_google_kms_secret_test.go index 47ba54a05c..5f95cc8308 100644 --- a/google-beta/services/kms/data_source_google_kms_secret_test.go +++ b/google-beta/services/kms/data_source_google_kms_secret_test.go @@ -8,8 +8,8 @@ import ( "log" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" diff --git a/google-beta/services/kms/iam_kms_crypto_key_test.go b/google-beta/services/kms/iam_kms_crypto_key_test.go index a9e54f3c6f..5793b178d9 100644 --- a/google-beta/services/kms/iam_kms_crypto_key_test.go +++ b/google-beta/services/kms/iam_kms_crypto_key_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/kms/iam_kms_key_ring_test.go b/google-beta/services/kms/iam_kms_key_ring_test.go index a5c3ef26f0..c146fce6ae 100644 --- a/google-beta/services/kms/iam_kms_key_ring_test.go +++ b/google-beta/services/kms/iam_kms_key_ring_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/kms/resource_kms_autokey_config_generated_test.go b/google-beta/services/kms/resource_kms_autokey_config_generated_test.go index 0e851200cf..b44d22a76d 100644 --- a/google-beta/services/kms/resource_kms_autokey_config_generated_test.go +++ b/google-beta/services/kms/resource_kms_autokey_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/kms/resource_kms_crypto_key_test.go b/google-beta/services/kms/resource_kms_crypto_key_test.go index 7fac337a19..0eee127c86 100644 --- a/google-beta/services/kms/resource_kms_crypto_key_test.go +++ b/google-beta/services/kms/resource_kms_crypto_key_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestCryptoKeyIdParsing(t *testing.T) { diff --git a/google-beta/services/kms/resource_kms_ekm_connection_test.go b/google-beta/services/kms/resource_kms_ekm_connection_test.go index ca239a922d..757c25bd08 100644 --- a/google-beta/services/kms/resource_kms_ekm_connection_test.go +++ b/google-beta/services/kms/resource_kms_ekm_connection_test.go @@ -5,7 +5,7 @@ package kms_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/resource_kms_key_handle_generated_test.go b/google-beta/services/kms/resource_kms_key_handle_generated_test.go index 9499748d72..01d07fade0 100644 --- a/google-beta/services/kms/resource_kms_key_handle_generated_test.go +++ b/google-beta/services/kms/resource_kms_key_handle_generated_test.go @@ -20,7 +20,7 @@ package kms_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/kms/resource_kms_key_ring_import_job_test.go b/google-beta/services/kms/resource_kms_key_ring_import_job_test.go index 797b40ebf9..e484a3b60d 100644 --- a/google-beta/services/kms/resource_kms_key_ring_import_job_test.go +++ b/google-beta/services/kms/resource_kms_key_ring_import_job_test.go @@ -5,7 +5,7 @@ package kms_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/kms/resource_kms_key_ring_test.go b/google-beta/services/kms/resource_kms_key_ring_test.go index ac8b8d5dc3..035e343f57 100644 --- a/google-beta/services/kms/resource_kms_key_ring_test.go +++ b/google-beta/services/kms/resource_kms_key_ring_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/kms/resource_kms_secret_ciphertext_test.go b/google-beta/services/kms/resource_kms_secret_ciphertext_test.go index d50a02294e..342e6b407b 100644 --- a/google-beta/services/kms/resource_kms_secret_ciphertext_test.go +++ b/google-beta/services/kms/resource_kms_secret_ciphertext_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudkms/v1" ) diff --git a/google-beta/services/logging/data_source_google_logging_folder_settings_test.go b/google-beta/services/logging/data_source_google_logging_folder_settings_test.go index 68b575fc26..e58bda30c2 100644 --- a/google-beta/services/logging/data_source_google_logging_folder_settings_test.go +++ b/google-beta/services/logging/data_source_google_logging_folder_settings_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/data_source_google_logging_organization_settings_test.go b/google-beta/services/logging/data_source_google_logging_organization_settings_test.go index cd51029018..200e7de842 100644 --- a/google-beta/services/logging/data_source_google_logging_organization_settings_test.go +++ b/google-beta/services/logging/data_source_google_logging_organization_settings_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/data_source_google_logging_project_cmek_settings_test.go b/google-beta/services/logging/data_source_google_logging_project_cmek_settings_test.go index 788f2de6ef..3ef1b832c0 100644 --- a/google-beta/services/logging/data_source_google_logging_project_cmek_settings_test.go +++ b/google-beta/services/logging/data_source_google_logging_project_cmek_settings_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/data_source_google_logging_project_settings_test.go b/google-beta/services/logging/data_source_google_logging_project_settings_test.go index 628885335a..fd4edb6972 100644 --- a/google-beta/services/logging/data_source_google_logging_project_settings_test.go +++ b/google-beta/services/logging/data_source_google_logging_project_settings_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/data_source_google_logging_sink_test.go b/google-beta/services/logging/data_source_google_logging_sink_test.go index 2ca8ad22b0..24550ea619 100644 --- a/google-beta/services/logging/data_source_google_logging_sink_test.go +++ b/google-beta/services/logging/data_source_google_logging_sink_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" diff --git a/google-beta/services/logging/iam_logging_log_view_generated_test.go b/google-beta/services/logging/iam_logging_log_view_generated_test.go index bfd544689f..64d955da31 100644 --- a/google-beta/services/logging/iam_logging_log_view_generated_test.go +++ b/google-beta/services/logging/iam_logging_log_view_generated_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_billing_account_exclusion_test.go b/google-beta/services/logging/resource_logging_billing_account_exclusion_test.go index 0057be5e0d..25bdcfe127 100644 --- a/google-beta/services/logging/resource_logging_billing_account_exclusion_test.go +++ b/google-beta/services/logging/resource_logging_billing_account_exclusion_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/resource_logging_billing_account_sink_test.go b/google-beta/services/logging/resource_logging_billing_account_sink_test.go index d58a6ef414..d04f66bd3d 100644 --- a/google-beta/services/logging/resource_logging_billing_account_sink_test.go +++ b/google-beta/services/logging/resource_logging_billing_account_sink_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/logging/resource_logging_bucket_config_test.go b/google-beta/services/logging/resource_logging_bucket_config_test.go index 81235552ae..b7bb3535ba 100644 --- a/google-beta/services/logging/resource_logging_bucket_config_test.go +++ b/google-beta/services/logging/resource_logging_bucket_config_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/resource_logging_folder_exclusion_test.go b/google-beta/services/logging/resource_logging_folder_exclusion_test.go index f88febbb0e..9f544a6ca7 100644 --- a/google-beta/services/logging/resource_logging_folder_exclusion_test.go +++ b/google-beta/services/logging/resource_logging_folder_exclusion_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" diff --git a/google-beta/services/logging/resource_logging_folder_settings_generated_test.go b/google-beta/services/logging/resource_logging_folder_settings_generated_test.go index 77017ebc4f..9f3a77354f 100644 --- a/google-beta/services/logging/resource_logging_folder_settings_generated_test.go +++ b/google-beta/services/logging/resource_logging_folder_settings_generated_test.go @@ -20,7 +20,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_folder_settings_test.go b/google-beta/services/logging/resource_logging_folder_settings_test.go index 55a8b39b41..e997f062e5 100644 --- a/google-beta/services/logging/resource_logging_folder_settings_test.go +++ b/google-beta/services/logging/resource_logging_folder_settings_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_folder_sink_test.go b/google-beta/services/logging/resource_logging_folder_sink_test.go index 1249bcc7fe..9cd5b9b12e 100644 --- a/google-beta/services/logging/resource_logging_folder_sink_test.go +++ b/google-beta/services/logging/resource_logging_folder_sink_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/logging/v2" ) diff --git a/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go b/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go index dfd163add5..306bdf5ca2 100644 --- a/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go +++ b/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_log_view_generated_test.go b/google-beta/services/logging/resource_logging_log_view_generated_test.go index 13f193fb4a..c91faa8264 100644 --- a/google-beta/services/logging/resource_logging_log_view_generated_test.go +++ b/google-beta/services/logging/resource_logging_log_view_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_log_view_test.go b/google-beta/services/logging/resource_logging_log_view_test.go index ee944bce30..39385faa9d 100644 --- a/google-beta/services/logging/resource_logging_log_view_test.go +++ b/google-beta/services/logging/resource_logging_log_view_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/resource_logging_metric_generated_test.go b/google-beta/services/logging/resource_logging_metric_generated_test.go index feb9738d76..2a5242f38c 100644 --- a/google-beta/services/logging/resource_logging_metric_generated_test.go +++ b/google-beta/services/logging/resource_logging_metric_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_metric_test.go b/google-beta/services/logging/resource_logging_metric_test.go index 4691ec3637..1ac8ca4df0 100644 --- a/google-beta/services/logging/resource_logging_metric_test.go +++ b/google-beta/services/logging/resource_logging_metric_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/resource_logging_organization_exclusion_test.go b/google-beta/services/logging/resource_logging_organization_exclusion_test.go index 4c87bc7813..1ac7faf1dd 100644 --- a/google-beta/services/logging/resource_logging_organization_exclusion_test.go +++ b/google-beta/services/logging/resource_logging_organization_exclusion_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/resource_logging_organization_settings_test.go b/google-beta/services/logging/resource_logging_organization_settings_test.go index a35c9b6cee..c2b9da09b2 100644 --- a/google-beta/services/logging/resource_logging_organization_settings_test.go +++ b/google-beta/services/logging/resource_logging_organization_settings_test.go @@ -5,7 +5,7 @@ package logging_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/logging/resource_logging_organization_sink_test.go b/google-beta/services/logging/resource_logging_organization_sink_test.go index ead673bcdc..cdbec8a5e5 100644 --- a/google-beta/services/logging/resource_logging_organization_sink_test.go +++ b/google-beta/services/logging/resource_logging_organization_sink_test.go @@ -8,8 +8,8 @@ import ( "strconv" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/logging/resource_logging_project_exclusion_test.go b/google-beta/services/logging/resource_logging_project_exclusion_test.go index 32994c02a5..b8949bc28c 100644 --- a/google-beta/services/logging/resource_logging_project_exclusion_test.go +++ b/google-beta/services/logging/resource_logging_project_exclusion_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/logging/resource_logging_project_sink_test.go b/google-beta/services/logging/resource_logging_project_sink_test.go index 4312154bb5..8c0a345265 100644 --- a/google-beta/services/logging/resource_logging_project_sink_test.go +++ b/google-beta/services/logging/resource_logging_project_sink_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/looker/resource_looker_instance_generated_test.go b/google-beta/services/looker/resource_looker_instance_generated_test.go index eeb1c27aea..0ae77684da 100644 --- a/google-beta/services/looker/resource_looker_instance_generated_test.go +++ b/google-beta/services/looker/resource_looker_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/looker/resource_looker_instance_test.go b/google-beta/services/looker/resource_looker_instance_test.go index ee4f1d0efb..1846889c7a 100644 --- a/google-beta/services/looker/resource_looker_instance_test.go +++ b/google-beta/services/looker/resource_looker_instance_test.go @@ -5,7 +5,7 @@ package looker_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go index 94351edbeb..93bdeca766 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/managedkafka/resource_managed_kafka_cluster_test.go b/google-beta/services/managedkafka/resource_managed_kafka_cluster_test.go index 9f855120b2..16a8c3c3b3 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_cluster_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_cluster_test.go @@ -5,7 +5,7 @@ package managedkafka_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go index bdd016831a..48f2a09ff6 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/managedkafka/resource_managed_kafka_topic_test.go b/google-beta/services/managedkafka/resource_managed_kafka_topic_test.go index 750147b504..9276d824cb 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_topic_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_topic_test.go @@ -5,7 +5,7 @@ package managedkafka_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/memcache/resource_memcache_instance_generated_test.go b/google-beta/services/memcache/resource_memcache_instance_generated_test.go index 8287df36a3..6db27b286f 100644 --- a/google-beta/services/memcache/resource_memcache_instance_generated_test.go +++ b/google-beta/services/memcache/resource_memcache_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/memcache/resource_memcache_instance_test.go b/google-beta/services/memcache/resource_memcache_instance_test.go index 15db7db764..a6c988d56e 100644 --- a/google-beta/services/memcache/resource_memcache_instance_test.go +++ b/google-beta/services/memcache/resource_memcache_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go b/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go index bd1675dcf3..51d66d6abf 100644 --- a/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go +++ b/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/migrationcenter/resource_migration_center_group_test.go b/google-beta/services/migrationcenter/resource_migration_center_group_test.go index 910e04f4e3..905c35a0e2 100644 --- a/google-beta/services/migrationcenter/resource_migration_center_group_test.go +++ b/google-beta/services/migrationcenter/resource_migration_center_group_test.go @@ -5,7 +5,7 @@ package migrationcenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go b/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go index f2ab3e92cd..0a7f77d6c9 100644 --- a/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go +++ b/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/migrationcenter/resource_migration_center_preference_set_test.go b/google-beta/services/migrationcenter/resource_migration_center_preference_set_test.go index 4db5842c01..87e2d0cf58 100644 --- a/google-beta/services/migrationcenter/resource_migration_center_preference_set_test.go +++ b/google-beta/services/migrationcenter/resource_migration_center_preference_set_test.go @@ -5,7 +5,7 @@ package migrationcenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/mlengine/resource_ml_engine_model_generated_test.go b/google-beta/services/mlengine/resource_ml_engine_model_generated_test.go index e7301ff718..59226d09c4 100644 --- a/google-beta/services/mlengine/resource_ml_engine_model_generated_test.go +++ b/google-beta/services/mlengine/resource_ml_engine_model_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go b/google-beta/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go index 7d7b086c62..21fcf2e323 100644 --- a/google-beta/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go +++ b/google-beta/services/monitoring/data_source_google_monitoring_uptime_check_ips_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/monitoring/data_source_monitoring_notification_channel_test.go b/google-beta/services/monitoring/data_source_monitoring_notification_channel_test.go index 414cf5f8bb..00ced64851 100644 --- a/google-beta/services/monitoring/data_source_monitoring_notification_channel_test.go +++ b/google-beta/services/monitoring/data_source_monitoring_notification_channel_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleMonitoringNotificationChannel_byDisplayName(t *testing.T) { diff --git a/google-beta/services/monitoring/data_source_monitoring_service_test.go b/google-beta/services/monitoring/data_source_monitoring_service_test.go index f3eaeab834..61273458d7 100644 --- a/google-beta/services/monitoring/data_source_monitoring_service_test.go +++ b/google-beta/services/monitoring/data_source_monitoring_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/monitoring/resource_monitoring_alert_policy_test.go b/google-beta/services/monitoring/resource_monitoring_alert_policy_test.go index 71b5f0a0ec..170bad6d21 100644 --- a/google-beta/services/monitoring/resource_monitoring_alert_policy_test.go +++ b/google-beta/services/monitoring/resource_monitoring_alert_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go b/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go index c0977c0533..dc8606450d 100644 --- a/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/monitoring/resource_monitoring_dashboard_test.go b/google-beta/services/monitoring/resource_monitoring_dashboard_test.go index 7f97f6b603..2c99b7e015 100644 --- a/google-beta/services/monitoring/resource_monitoring_dashboard_test.go +++ b/google-beta/services/monitoring/resource_monitoring_dashboard_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/monitoring/resource_monitoring_group_generated_test.go b/google-beta/services/monitoring/resource_monitoring_group_generated_test.go index 6dbfa0d608..d5312568ab 100644 --- a/google-beta/services/monitoring/resource_monitoring_group_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/monitoring/resource_monitoring_group_test.go b/google-beta/services/monitoring/resource_monitoring_group_test.go index 35f2642ade..3b21239c05 100644 --- a/google-beta/services/monitoring/resource_monitoring_group_test.go +++ b/google-beta/services/monitoring/resource_monitoring_group_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go b/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go index 272cf9677c..2019990b49 100644 --- a/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/monitoring/resource_monitoring_metric_descriptor_test.go b/google-beta/services/monitoring/resource_monitoring_metric_descriptor_test.go index 110f4c38a2..f0d75a5c0b 100644 --- a/google-beta/services/monitoring/resource_monitoring_metric_descriptor_test.go +++ b/google-beta/services/monitoring/resource_monitoring_metric_descriptor_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go b/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go index aa8352fde5..330f4cd613 100644 --- a/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/monitoring/resource_monitoring_monitored_project_test.go b/google-beta/services/monitoring/resource_monitoring_monitored_project_test.go index 153c4edebe..eed05bb2fb 100644 --- a/google-beta/services/monitoring/resource_monitoring_monitored_project_test.go +++ b/google-beta/services/monitoring/resource_monitoring_monitored_project_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" diff --git a/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go b/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go index c6b03a20c1..78eeae735d 100644 --- a/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/monitoring/resource_monitoring_notification_channel_test.go b/google-beta/services/monitoring/resource_monitoring_notification_channel_test.go index 30214225a2..bd5101ec1b 100644 --- a/google-beta/services/monitoring/resource_monitoring_notification_channel_test.go +++ b/google-beta/services/monitoring/resource_monitoring_notification_channel_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/monitoring/resource_monitoring_service_generated_test.go b/google-beta/services/monitoring/resource_monitoring_service_generated_test.go index 65af505750..e470d71a92 100644 --- a/google-beta/services/monitoring/resource_monitoring_service_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/monitoring/resource_monitoring_service_test.go b/google-beta/services/monitoring/resource_monitoring_service_test.go index 48984d32d5..a5ca816ea7 100644 --- a/google-beta/services/monitoring/resource_monitoring_service_test.go +++ b/google-beta/services/monitoring/resource_monitoring_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go b/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go index 0d9ce7964c..d277652104 100644 --- a/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/monitoring/resource_monitoring_slo_test.go b/google-beta/services/monitoring/resource_monitoring_slo_test.go index 3d9a6388c4..7108559c50 100644 --- a/google-beta/services/monitoring/resource_monitoring_slo_test.go +++ b/google-beta/services/monitoring/resource_monitoring_slo_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go b/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go index 7cd4a27bd1..5a10d14d6b 100644 --- a/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/monitoring/resource_monitoring_uptime_check_config_test.go b/google-beta/services/monitoring/resource_monitoring_uptime_check_config_test.go index e0c0ca3f31..14bd79a0a5 100644 --- a/google-beta/services/monitoring/resource_monitoring_uptime_check_config_test.go +++ b/google-beta/services/monitoring/resource_monitoring_uptime_check_config_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go b/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go index ad057b2081..8dbbca09c3 100644 --- a/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_active_directory_test.go b/google-beta/services/netapp/resource_netapp_active_directory_test.go index 4d00e21e83..4b72245e64 100644 --- a/google-beta/services/netapp/resource_netapp_active_directory_test.go +++ b/google-beta/services/netapp/resource_netapp_active_directory_test.go @@ -5,7 +5,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_backup_generated_test.go b/google-beta/services/netapp/resource_netapp_backup_generated_test.go index 7483e47f50..c8840013e3 100644 --- a/google-beta/services/netapp/resource_netapp_backup_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go b/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go index a249b9ee02..224dac307b 100644 --- a/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_backup_policy_test.go b/google-beta/services/netapp/resource_netapp_backup_policy_test.go index e6cc32a3ed..53827c21ce 100644 --- a/google-beta/services/netapp/resource_netapp_backup_policy_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_policy_test.go @@ -5,7 +5,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_backup_test.go b/google-beta/services/netapp/resource_netapp_backup_test.go index eeb34f9e34..53773cb10f 100644 --- a/google-beta/services/netapp/resource_netapp_backup_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_test.go @@ -8,7 +8,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_backup_vault_test.go b/google-beta/services/netapp/resource_netapp_backup_vault_test.go index 7a452fbf63..389dffde5b 100644 --- a/google-beta/services/netapp/resource_netapp_backup_vault_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_vault_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go b/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go index bfdf1f51e6..f5d05fa709 100644 --- a/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_kmsconfig_test.go b/google-beta/services/netapp/resource_netapp_kmsconfig_test.go index 27bbe4054f..f38d0cd236 100644 --- a/google-beta/services/netapp/resource_netapp_kmsconfig_test.go +++ b/google-beta/services/netapp/resource_netapp_kmsconfig_test.go @@ -8,7 +8,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go b/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go index 6cbbcaae43..6e5aaabf7f 100644 --- a/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_storage_pool_test.go b/google-beta/services/netapp/resource_netapp_storage_pool_test.go index 1c0ae3c34e..f70c11ace7 100644 --- a/google-beta/services/netapp/resource_netapp_storage_pool_test.go +++ b/google-beta/services/netapp/resource_netapp_storage_pool_test.go @@ -3,11 +3,11 @@ package netapp_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_volume_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_generated_test.go index fb8dae7fc0..725b560b2e 100644 --- a/google-beta/services/netapp/resource_netapp_volume_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go index c9f09cfef3..5803d43b34 100644 --- a/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_volume_replication_test.go b/google-beta/services/netapp/resource_netapp_volume_replication_test.go index 4e1859c94b..d796a64ea8 100644 --- a/google-beta/services/netapp/resource_netapp_volume_replication_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_replication_test.go @@ -8,7 +8,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go index 0943330230..f6265a82f8 100644 --- a/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/netapp/resource_netapp_volume_snapshot_test.go b/google-beta/services/netapp/resource_netapp_volume_snapshot_test.go index d6feb5619e..f5a5f20805 100644 --- a/google-beta/services/netapp/resource_netapp_volume_snapshot_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_snapshot_test.go @@ -8,7 +8,7 @@ package netapp_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/netapp/resource_netapp_volume_test.go b/google-beta/services/netapp/resource_netapp_volume_test.go index 5388e6793b..893809412f 100644 --- a/google-beta/services/netapp/resource_netapp_volume_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go index 3416d527fc..da57e2a0fb 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_hub_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_hub_test.go index 10435ec10e..62d5815f59 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_hub_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_hub_test.go @@ -8,7 +8,7 @@ package networkconnectivity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_generated_test.go index 2d2be9911d..7970992cd1 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_test.go index f47b0b39bd..7a16d902e0 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_test.go @@ -3,7 +3,7 @@ package networkconnectivity_test import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" ) diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go index 6a1a2dea18..b515b37212 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go index a841624874..716acd5c61 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go index 1b2562045f..d09d227031 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policy_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policy_generated_test.go index 1038388a2e..3d32b7eba7 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policy_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_service_connection_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go index ca29743acd..e61f507707 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go b/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go index 7e056a7582..cf94f99fba 100644 --- a/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go +++ b/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go b/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go index 73ce69ca29..12aea2cc9a 100644 --- a/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go +++ b/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networksecurity/iam_network_security_address_group_generated_test.go b/google-beta/services/networksecurity/iam_network_security_address_group_generated_test.go index aa0ec3a673..7810a2fa30 100644 --- a/google-beta/services/networksecurity/iam_network_security_address_group_generated_test.go +++ b/google-beta/services/networksecurity/iam_network_security_address_group_generated_test.go @@ -20,7 +20,7 @@ package networksecurity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go index 30b28cd5de..7604e78dbe 100644 --- a/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networksecurity/resource_network_security_address_group_test.go b/google-beta/services/networksecurity/resource_network_security_address_group_test.go index 6df2278bec..ba1b90da2d 100644 --- a/google-beta/services/networksecurity/resource_network_security_address_group_test.go +++ b/google-beta/services/networksecurity/resource_network_security_address_group_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go index 3edcf68ada..461e88512e 100644 --- a/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_authorization_policy_test.go b/google-beta/services/networksecurity/resource_network_security_authorization_policy_test.go index 526a679901..5dbe5417c9 100644 --- a/google-beta/services/networksecurity/resource_network_security_authorization_policy_test.go +++ b/google-beta/services/networksecurity/resource_network_security_authorization_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go index 52f2a13375..0c346ccde8 100644 --- a/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_client_tls_policy_test.go b/google-beta/services/networksecurity/resource_network_security_client_tls_policy_test.go index 05755976db..9b5cb2f215 100644 --- a/google-beta/services/networksecurity/resource_network_security_client_tls_policy_test.go +++ b/google-beta/services/networksecurity/resource_network_security_client_tls_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go b/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go index ff1100fafb..517e264faf 100644 --- a/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go +++ b/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_association_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_test.go b/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_test.go index 2ef39f9c51..e016904424 100644 --- a/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_test.go +++ b/google-beta/services/networksecurity/resource_network_security_firewall_endpoint_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go index 35800468a5..d4f343135d 100644 --- a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go index 4aff676264..b073c22bd9 100644 --- a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go index 56541beaf0..ae52aa029d 100644 --- a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go +++ b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkSecurityGatewaySecurityPolicyRule_update(t *testing.T) { diff --git a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_test.go b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_test.go index d76072eff2..be31f62d21 100644 --- a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_test.go +++ b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkSecurityGatewaySecurityPolicy_update(t *testing.T) { diff --git a/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go b/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go index 6f6fb83220..0e608947a6 100644 --- a/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go index 299fa6e00b..c11266b84f 100644 --- a/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/networksecurity/resource_network_security_security_profile_group_test.go b/google-beta/services/networksecurity/resource_network_security_security_profile_group_test.go index f46ba5a3b0..2b114ce141 100644 --- a/google-beta/services/networksecurity/resource_network_security_security_profile_group_test.go +++ b/google-beta/services/networksecurity/resource_network_security_security_profile_group_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/networksecurity/resource_network_security_security_profile_test.go b/google-beta/services/networksecurity/resource_network_security_security_profile_test.go index 76961a6585..c889e79856 100644 --- a/google-beta/services/networksecurity/resource_network_security_security_profile_test.go +++ b/google-beta/services/networksecurity/resource_network_security_security_profile_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go index d9e6392764..1d05154a26 100644 --- a/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_server_tls_policy_test.go b/google-beta/services/networksecurity/resource_network_security_server_tls_policy_test.go index 9257b21c31..b623a24ccc 100644 --- a/google-beta/services/networksecurity/resource_network_security_server_tls_policy_test.go +++ b/google-beta/services/networksecurity/resource_network_security_server_tls_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go index 1e3f2c01fd..371bd0f1d8 100644 --- a/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_test.go b/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_test.go index e88c2be63d..bd7cb00db5 100644 --- a/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_test.go +++ b/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_test.go @@ -5,7 +5,7 @@ package networksecurity_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go b/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go index 0c0f2d35ec..d5d61347ba 100644 --- a/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networksecurity/resource_network_security_url_lists_test.go b/google-beta/services/networksecurity/resource_network_security_url_lists_test.go index 7cb46602ca..907782b097 100644 --- a/google-beta/services/networksecurity/resource_network_security_url_lists_test.go +++ b/google-beta/services/networksecurity/resource_network_security_url_lists_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkSecurityUrlLists_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go index 45b18dfb9e..51c8413811 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_test.go index de6421cb1b..bce49f48a1 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_test.go @@ -5,7 +5,7 @@ package networkservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go index acc28f152c..e2067ba42f 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_origin_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_origin_test.go index bb547a2ddc..ca4cdb8e00 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_origin_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_origin_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go index 824c5cadbe..5793f9697e 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_service_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_service_test.go index 81665793e3..778dc22438 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_service_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go b/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go index 643b05045c..058121cf9e 100644 --- a/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_endpoint_policy_test.go b/google-beta/services/networkservices/resource_network_services_endpoint_policy_test.go index 94275b4717..407480a015 100644 --- a/google-beta/services/networkservices/resource_network_services_endpoint_policy_test.go +++ b/google-beta/services/networkservices/resource_network_services_endpoint_policy_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesEndpointPolicy_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go b/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go index 0083de4b7b..24c7445baa 100644 --- a/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_gateway_test.go b/google-beta/services/networkservices/resource_network_services_gateway_test.go index 54bd07f1a6..1c67602549 100644 --- a/google-beta/services/networkservices/resource_network_services_gateway_test.go +++ b/google-beta/services/networkservices/resource_network_services_gateway_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesGateway_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go index ff492aedb2..1805bced28 100644 --- a/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_grpc_route_test.go b/google-beta/services/networkservices/resource_network_services_grpc_route_test.go index d68bd1da87..066448d178 100644 --- a/google-beta/services/networkservices/resource_network_services_grpc_route_test.go +++ b/google-beta/services/networkservices/resource_network_services_grpc_route_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go index 2882c8b91d..4f094e4644 100644 --- a/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_http_route_test.go b/google-beta/services/networkservices/resource_network_services_http_route_test.go index 8ee9820f8e..979aa1cdb8 100644 --- a/google-beta/services/networkservices/resource_network_services_http_route_test.go +++ b/google-beta/services/networkservices/resource_network_services_http_route_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesHttpRoute_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go b/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go index b316778a7a..609e18ffee 100644 --- a/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_lb_route_extension_test.go b/google-beta/services/networkservices/resource_network_services_lb_route_extension_test.go index a0bca8fb16..ffc80b5e1a 100644 --- a/google-beta/services/networkservices/resource_network_services_lb_route_extension_test.go +++ b/google-beta/services/networkservices/resource_network_services_lb_route_extension_test.go @@ -5,7 +5,7 @@ package networkservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go b/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go index 36552316c7..309f8329d1 100644 --- a/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_test.go b/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_test.go index e48e407273..84cab26ce2 100644 --- a/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_test.go +++ b/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_test.go @@ -5,7 +5,7 @@ package networkservices_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go b/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go index 0bd18510be..5dc44460ea 100644 --- a/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_mesh_test.go b/google-beta/services/networkservices/resource_network_services_mesh_test.go index e113e4f25b..e39e924154 100644 --- a/google-beta/services/networkservices/resource_network_services_mesh_test.go +++ b/google-beta/services/networkservices/resource_network_services_mesh_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesMesh_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_service_binding_generated_test.go b/google-beta/services/networkservices/resource_network_services_service_binding_generated_test.go index dd99c1f2b9..10d9e9d76a 100644 --- a/google-beta/services/networkservices/resource_network_services_service_binding_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_service_binding_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_service_binding_test.go b/google-beta/services/networkservices/resource_network_services_service_binding_test.go index 1adc380a78..21c158e22a 100644 --- a/google-beta/services/networkservices/resource_network_services_service_binding_test.go +++ b/google-beta/services/networkservices/resource_network_services_service_binding_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesServiceBinding_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go b/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go index 6431d0a6ff..ae3e8e70a7 100644 --- a/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_service_lb_policies_test.go b/google-beta/services/networkservices/resource_network_services_service_lb_policies_test.go index de97ebef4c..c3eede3912 100644 --- a/google-beta/services/networkservices/resource_network_services_service_lb_policies_test.go +++ b/google-beta/services/networkservices/resource_network_services_service_lb_policies_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesLBPolicies_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go index 736cd431b6..2ed06b92df 100644 --- a/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_tcp_route_test.go b/google-beta/services/networkservices/resource_network_services_tcp_route_test.go index 1d100b3176..b4bac231a7 100644 --- a/google-beta/services/networkservices/resource_network_services_tcp_route_test.go +++ b/google-beta/services/networkservices/resource_network_services_tcp_route_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesTcpRoute_update(t *testing.T) { diff --git a/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go index 92a3fa6ca2..68434d17d2 100644 --- a/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/networkservices/resource_network_services_tls_route_test.go b/google-beta/services/networkservices/resource_network_services_tls_route_test.go index dd060ddcd3..0f82378f49 100644 --- a/google-beta/services/networkservices/resource_network_services_tls_route_test.go +++ b/google-beta/services/networkservices/resource_network_services_tls_route_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccNetworkServicesTlsRoute_update(t *testing.T) { diff --git a/google-beta/services/notebooks/iam_notebooks_instance_generated_test.go b/google-beta/services/notebooks/iam_notebooks_instance_generated_test.go index 20f38809be..a29817acff 100644 --- a/google-beta/services/notebooks/iam_notebooks_instance_generated_test.go +++ b/google-beta/services/notebooks/iam_notebooks_instance_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/notebooks/iam_notebooks_runtime_generated_test.go b/google-beta/services/notebooks/iam_notebooks_runtime_generated_test.go index fec1236eac..11eec12370 100644 --- a/google-beta/services/notebooks/iam_notebooks_runtime_generated_test.go +++ b/google-beta/services/notebooks/iam_notebooks_runtime_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go b/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go index bca70c0a58..8c1f0293dc 100644 --- a/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go +++ b/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/notebooks/resource_notebooks_environment_test.go b/google-beta/services/notebooks/resource_notebooks_environment_test.go index d91baaeedc..f083f5de12 100644 --- a/google-beta/services/notebooks/resource_notebooks_environment_test.go +++ b/google-beta/services/notebooks/resource_notebooks_environment_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/notebooks/resource_notebooks_instance_container_test.go b/google-beta/services/notebooks/resource_notebooks_instance_container_test.go index 8259437e0e..5352409d38 100644 --- a/google-beta/services/notebooks/resource_notebooks_instance_container_test.go +++ b/google-beta/services/notebooks/resource_notebooks_instance_container_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go b/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go index 039a9047ee..9119d7ee7c 100644 --- a/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go +++ b/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/notebooks/resource_notebooks_instance_gpu_test.go b/google-beta/services/notebooks/resource_notebooks_instance_gpu_test.go index 6cf4d78c24..6fe84f6acf 100644 --- a/google-beta/services/notebooks/resource_notebooks_instance_gpu_test.go +++ b/google-beta/services/notebooks/resource_notebooks_instance_gpu_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/notebooks/resource_notebooks_instance_state_test.go b/google-beta/services/notebooks/resource_notebooks_instance_state_test.go index 03bd28c0ad..6939396b19 100644 --- a/google-beta/services/notebooks/resource_notebooks_instance_state_test.go +++ b/google-beta/services/notebooks/resource_notebooks_instance_state_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/notebooks/resource_notebooks_instance_test.go b/google-beta/services/notebooks/resource_notebooks_instance_test.go index f432343d0d..adccccba2f 100644 --- a/google-beta/services/notebooks/resource_notebooks_instance_test.go +++ b/google-beta/services/notebooks/resource_notebooks_instance_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go b/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go index 2723aefd7f..1014674af5 100644 --- a/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go +++ b/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/notebooks/resource_notebooks_runtime_test.go b/google-beta/services/notebooks/resource_notebooks_runtime_test.go index ddf12f3dcf..bdb9269505 100644 --- a/google-beta/services/notebooks/resource_notebooks_runtime_test.go +++ b/google-beta/services/notebooks/resource_notebooks_runtime_test.go @@ -5,7 +5,7 @@ package notebooks_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go b/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go index 9fb8bf4941..7bb9b2856c 100644 --- a/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go +++ b/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_test.go b/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_test.go index 50fe216137..8a2ad0e030 100644 --- a/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_test.go +++ b/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccOrgPolicyCustomConstraint_update(t *testing.T) { diff --git a/google-beta/services/orgpolicy/resource_org_policy_policy_test.go b/google-beta/services/orgpolicy/resource_org_policy_policy_test.go index 9d551ae062..a2deb56590 100644 --- a/google-beta/services/orgpolicy/resource_org_policy_policy_test.go +++ b/google-beta/services/orgpolicy/resource_org_policy_policy_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go b/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go index d3c480b42b..965dfb822f 100644 --- a/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go +++ b/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/osconfig/resource_os_config_os_policy_assignment_test.go b/google-beta/services/osconfig/resource_os_config_os_policy_assignment_test.go index 8ff3d6c6e4..1523f00d5c 100644 --- a/google-beta/services/osconfig/resource_os_config_os_policy_assignment_test.go +++ b/google-beta/services/osconfig/resource_os_config_os_policy_assignment_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go b/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go index 96c4f30ad8..f27f50e035 100644 --- a/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go +++ b/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go b/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go index ec74bd9442..7f100d5b01 100644 --- a/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go +++ b/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/oslogin/resource_os_login_ssh_public_key_test.go b/google-beta/services/oslogin/resource_os_login_ssh_public_key_test.go index d96d93d220..e08bf2ac7c 100644 --- a/google-beta/services/oslogin/resource_os_login_ssh_public_key_test.go +++ b/google-beta/services/oslogin/resource_os_login_ssh_public_key_test.go @@ -5,7 +5,7 @@ package oslogin_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go b/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go index 503fcc8f80..76fe00a550 100644 --- a/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go +++ b/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/parallelstore/resource_parallelstore_instance_test.go b/google-beta/services/parallelstore/resource_parallelstore_instance_test.go index 4bc4704da8..5fda87a13c 100644 --- a/google-beta/services/parallelstore/resource_parallelstore_instance_test.go +++ b/google-beta/services/parallelstore/resource_parallelstore_instance_test.go @@ -5,7 +5,7 @@ package parallelstore_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/privateca/data_source_certificate_authority_test.go b/google-beta/services/privateca/data_source_certificate_authority_test.go index d30980006e..24027bcf22 100644 --- a/google-beta/services/privateca/data_source_certificate_authority_test.go +++ b/google-beta/services/privateca/data_source_certificate_authority_test.go @@ -5,7 +5,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/privateca/iam_privateca_ca_pool_generated_test.go b/google-beta/services/privateca/iam_privateca_ca_pool_generated_test.go index 66c0d1eadf..1280b41eaf 100644 --- a/google-beta/services/privateca/iam_privateca_ca_pool_generated_test.go +++ b/google-beta/services/privateca/iam_privateca_ca_pool_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/privateca/iam_privateca_ca_pool_test.go b/google-beta/services/privateca/iam_privateca_ca_pool_test.go index 57fd8729ba..6ed051e0dc 100644 --- a/google-beta/services/privateca/iam_privateca_ca_pool_test.go +++ b/google-beta/services/privateca/iam_privateca_ca_pool_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca" diff --git a/google-beta/services/privateca/iam_privateca_certificate_template_generated_test.go b/google-beta/services/privateca/iam_privateca_certificate_template_generated_test.go index a07f0ff59a..312fece2cd 100644 --- a/google-beta/services/privateca/iam_privateca_certificate_template_generated_test.go +++ b/google-beta/services/privateca/iam_privateca_certificate_template_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go b/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go index 408682416a..b0add4aff6 100644 --- a/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/privateca/resource_privateca_ca_pool_test.go b/google-beta/services/privateca/resource_privateca_ca_pool_test.go index 0015dd7ff4..6fdf6f13b9 100644 --- a/google-beta/services/privateca/resource_privateca_ca_pool_test.go +++ b/google-beta/services/privateca/resource_privateca_ca_pool_test.go @@ -5,7 +5,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go b/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go index 4863a4be68..9dff218f75 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/privateca/resource_privateca_certificate_authority_test.go b/google-beta/services/privateca/resource_privateca_certificate_authority_test.go index 53a689427c..0a8a76bbdd 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_authority_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_authority_test.go @@ -5,7 +5,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/privateca/resource_privateca_certificate_generated_test.go b/google-beta/services/privateca/resource_privateca_certificate_generated_test.go index 589f54f55a..a1bc80dfd3 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go b/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go index 8fdc42a526..285f3703b8 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/privateca/resource_privateca_certificate_template_test.go b/google-beta/services/privateca/resource_privateca_certificate_template_test.go index 520c10e4aa..13e609b54a 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_template_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_template_test.go @@ -5,7 +5,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/privateca/resource_privateca_certificate_test.go b/google-beta/services/privateca/resource_privateca_certificate_test.go index cae8213433..8f55fe7c73 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_test.go @@ -5,7 +5,7 @@ package privateca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go b/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go index b006a8a4a1..804b4273db 100644 --- a/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go +++ b/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go b/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go index d867fbfb3d..565a894b36 100644 --- a/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go +++ b/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go @@ -5,7 +5,7 @@ package privilegedaccessmanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/publicca/resource_public_ca_external_account_key_generated_test.go b/google-beta/services/publicca/resource_public_ca_external_account_key_generated_test.go index e8e794c284..c34da8adae 100644 --- a/google-beta/services/publicca/resource_public_ca_external_account_key_generated_test.go +++ b/google-beta/services/publicca/resource_public_ca_external_account_key_generated_test.go @@ -20,7 +20,7 @@ package publicca_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/pubsub/data_source_pubsub_subscription_test.go b/google-beta/services/pubsub/data_source_pubsub_subscription_test.go index 4a959d0555..8fdc699a85 100644 --- a/google-beta/services/pubsub/data_source_pubsub_subscription_test.go +++ b/google-beta/services/pubsub/data_source_pubsub_subscription_test.go @@ -5,7 +5,7 @@ package pubsub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/pubsub/data_source_pubsub_topic_test.go b/google-beta/services/pubsub/data_source_pubsub_topic_test.go index 56cfc5793d..6cf4221189 100644 --- a/google-beta/services/pubsub/data_source_pubsub_topic_test.go +++ b/google-beta/services/pubsub/data_source_pubsub_topic_test.go @@ -5,7 +5,7 @@ package pubsub_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/pubsub/iam_pubsub_schema_generated_test.go b/google-beta/services/pubsub/iam_pubsub_schema_generated_test.go index a6d2c967d1..3e5a232837 100644 --- a/google-beta/services/pubsub/iam_pubsub_schema_generated_test.go +++ b/google-beta/services/pubsub/iam_pubsub_schema_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/pubsub/iam_pubsub_subscription_test.go b/google-beta/services/pubsub/iam_pubsub_subscription_test.go index 5dfe47a234..ca0d28b841 100644 --- a/google-beta/services/pubsub/iam_pubsub_subscription_test.go +++ b/google-beta/services/pubsub/iam_pubsub_subscription_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/pubsub/iam_pubsub_topic_generated_test.go b/google-beta/services/pubsub/iam_pubsub_topic_generated_test.go index a797b4395a..24d8085b38 100644 --- a/google-beta/services/pubsub/iam_pubsub_topic_generated_test.go +++ b/google-beta/services/pubsub/iam_pubsub_topic_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/pubsub/iam_pubsub_topic_test.go b/google-beta/services/pubsub/iam_pubsub_topic_test.go index b44673b952..b7824bab7d 100644 --- a/google-beta/services/pubsub/iam_pubsub_topic_test.go +++ b/google-beta/services/pubsub/iam_pubsub_topic_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccPubsubTopicIamBinding(t *testing.T) { diff --git a/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go b/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go index c534022311..5b2fae1c9e 100644 --- a/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go +++ b/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/pubsub/resource_pubsub_schema_test.go b/google-beta/services/pubsub/resource_pubsub_schema_test.go index 2491bd8137..379e8c8865 100644 --- a/google-beta/services/pubsub/resource_pubsub_schema_test.go +++ b/google-beta/services/pubsub/resource_pubsub_schema_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go b/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go index c7e3f11003..6bbc72bb54 100644 --- a/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go +++ b/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/pubsub/resource_pubsub_subscription_test.go b/google-beta/services/pubsub/resource_pubsub_subscription_test.go index be94e6cf47..a4993f3e16 100644 --- a/google-beta/services/pubsub/resource_pubsub_subscription_test.go +++ b/google-beta/services/pubsub/resource_pubsub_subscription_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub" diff --git a/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go b/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go index 716d0a242e..c6a71747d5 100644 --- a/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go +++ b/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/pubsub/resource_pubsub_topic_test.go b/google-beta/services/pubsub/resource_pubsub_topic_test.go index 41a1d46d09..aecd6b9de8 100644 --- a/google-beta/services/pubsub/resource_pubsub_topic_test.go +++ b/google-beta/services/pubsub/resource_pubsub_topic_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go index f805487e82..49dd0ed47b 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go index 8d7379c939..9ba1c6b57d 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_subscription_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_subscription_test.go index 9cb2dbf597..ea8dc2015a 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_subscription_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_subscription_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go index de7f3c2696..471a127b72 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_topic_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_topic_test.go index 242ec15b59..ae86f17a13 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_topic_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_topic_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/recaptchaenterprise/resource_recaptcha_enterprise_key_generated_test.go b/google-beta/services/recaptchaenterprise/resource_recaptcha_enterprise_key_generated_test.go index 7f5c157cfe..f001cae142 100644 --- a/google-beta/services/recaptchaenterprise/resource_recaptcha_enterprise_key_generated_test.go +++ b/google-beta/services/recaptchaenterprise/resource_recaptcha_enterprise_key_generated_test.go @@ -23,8 +23,8 @@ import ( "fmt" dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl" recaptchaenterprise "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/recaptchaenterprise/beta" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "strings" "testing" diff --git a/google-beta/services/redis/data_source_redis_instance_test.go b/google-beta/services/redis/data_source_redis_instance_test.go index ddfd1d804c..b101551759 100644 --- a/google-beta/services/redis/data_source_redis_instance_test.go +++ b/google-beta/services/redis/data_source_redis_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/redis/resource_redis_cluster_generated_test.go b/google-beta/services/redis/resource_redis_cluster_generated_test.go index 070adef1e7..6fe407fa32 100644 --- a/google-beta/services/redis/resource_redis_cluster_generated_test.go +++ b/google-beta/services/redis/resource_redis_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/redis/resource_redis_cluster_test.go b/google-beta/services/redis/resource_redis_cluster_test.go index be32f74d8d..f63f080dcf 100644 --- a/google-beta/services/redis/resource_redis_cluster_test.go +++ b/google-beta/services/redis/resource_redis_cluster_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/redis/resource_redis_instance_generated_test.go b/google-beta/services/redis/resource_redis_instance_generated_test.go index a489c8e076..9fca26fab9 100644 --- a/google-beta/services/redis/resource_redis_instance_generated_test.go +++ b/google-beta/services/redis/resource_redis_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/redis/resource_redis_instance_test.go b/google-beta/services/redis/resource_redis_instance_test.go index cac078a8ee..3de149aa79 100644 --- a/google-beta/services/redis/resource_redis_instance_test.go +++ b/google-beta/services/redis/resource_redis_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_active_folder_test.go b/google-beta/services/resourcemanager/data_source_google_active_folder_test.go index d16376f84b..1aea905530 100644 --- a/google-beta/services/resourcemanager/data_source_google_active_folder_test.go +++ b/google-beta/services/resourcemanager/data_source_google_active_folder_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_client_config_test.go b/google-beta/services/resourcemanager/data_source_google_client_config_test.go index ee8ce35358..928a08a944 100644 --- a/google-beta/services/resourcemanager/data_source_google_client_config_test.go +++ b/google-beta/services/resourcemanager/data_source_google_client_config_test.go @@ -5,7 +5,7 @@ package resourcemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/resourcemanager/data_source_google_client_openid_userinfo_test.go b/google-beta/services/resourcemanager/data_source_google_client_openid_userinfo_test.go index 88a8cddf52..6402c26b56 100644 --- a/google-beta/services/resourcemanager/data_source_google_client_openid_userinfo_test.go +++ b/google-beta/services/resourcemanager/data_source_google_client_openid_userinfo_test.go @@ -5,7 +5,7 @@ package resourcemanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/resourcemanager/data_source_google_folder_organization_policy_test.go b/google-beta/services/resourcemanager/data_source_google_folder_organization_policy_test.go index 733ece01d0..12397ca8ce 100644 --- a/google-beta/services/resourcemanager/data_source_google_folder_organization_policy_test.go +++ b/google-beta/services/resourcemanager/data_source_google_folder_organization_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_folder_test.go b/google-beta/services/resourcemanager/data_source_google_folder_test.go index afce9a6966..192c745f1d 100644 --- a/google-beta/services/resourcemanager/data_source_google_folder_test.go +++ b/google-beta/services/resourcemanager/data_source_google_folder_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleFolder_byFullName(t *testing.T) { diff --git a/google-beta/services/resourcemanager/data_source_google_folders_test.go b/google-beta/services/resourcemanager/data_source_google_folders_test.go index 1a75b51b03..3b8cf44db4 100644 --- a/google-beta/services/resourcemanager/data_source_google_folders_test.go +++ b/google-beta/services/resourcemanager/data_source_google_folders_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_iam_role_test.go b/google-beta/services/resourcemanager/data_source_google_iam_role_test.go index 434e7adb18..b706742bfd 100644 --- a/google-beta/services/resourcemanager/data_source_google_iam_role_test.go +++ b/google-beta/services/resourcemanager/data_source_google_iam_role_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceIAMRole(t *testing.T) { diff --git a/google-beta/services/resourcemanager/data_source_google_iam_testable_permissions_test.go b/google-beta/services/resourcemanager/data_source_google_iam_testable_permissions_test.go index d08a192fe9..42a674cdbc 100644 --- a/google-beta/services/resourcemanager/data_source_google_iam_testable_permissions_test.go +++ b/google-beta/services/resourcemanager/data_source_google_iam_testable_permissions_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDataSourceGoogleIamTestablePermissions_basic(t *testing.T) { diff --git a/google-beta/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go b/google-beta/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go index 337418bf5d..bfe7025dbe 100644 --- a/google-beta/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go +++ b/google-beta/services/resourcemanager/data_source_google_netblock_ip_ranges_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/resourcemanager/data_source_google_organization_test.go b/google-beta/services/resourcemanager/data_source_google_organization_test.go index 4e07dcdf38..8570db2a62 100644 --- a/google-beta/services/resourcemanager/data_source_google_organization_test.go +++ b/google-beta/services/resourcemanager/data_source_google_organization_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleOrganization_byFullName(t *testing.T) { diff --git a/google-beta/services/resourcemanager/data_source_google_project_organization_policy_test.go b/google-beta/services/resourcemanager/data_source_google_project_organization_policy_test.go index a01b5efb2f..389f5a4866 100644 --- a/google-beta/services/resourcemanager/data_source_google_project_organization_policy_test.go +++ b/google-beta/services/resourcemanager/data_source_google_project_organization_policy_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_project_service_test.go b/google-beta/services/resourcemanager/data_source_google_project_service_test.go index c1ccb0f6ef..925cf2b10f 100644 --- a/google-beta/services/resourcemanager/data_source_google_project_service_test.go +++ b/google-beta/services/resourcemanager/data_source_google_project_service_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_project_test.go b/google-beta/services/resourcemanager/data_source_google_project_test.go index a1899139ea..9cdd68f49c 100644 --- a/google-beta/services/resourcemanager/data_source_google_project_test.go +++ b/google-beta/services/resourcemanager/data_source_google_project_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_projects_test.go b/google-beta/services/resourcemanager/data_source_google_projects_test.go index ffe0ee110e..be3e74c792 100644 --- a/google-beta/services/resourcemanager/data_source_google_projects_test.go +++ b/google-beta/services/resourcemanager/data_source_google_projects_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go index 426ee23075..ffd35447ba 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go +++ b/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func testAccCheckServiceAccountAccessTokenValue(name, value string) resource.TestCheckFunc { diff --git a/google-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go index 7e737971c1..b1dfaf1653 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go +++ b/google-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go @@ -10,8 +10,8 @@ import ( "google.golang.org/api/idtoken" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go index 8df73c1a4d..7454b5e089 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go +++ b/google-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go @@ -13,8 +13,8 @@ import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" diff --git a/google-beta/services/resourcemanager/data_source_google_service_account_key_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_key_test.go index 8661c64050..285b6175cb 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_key_test.go +++ b/google-beta/services/resourcemanager/data_source_google_service_account_key_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDatasourceGoogleServiceAccountKey_basic(t *testing.T) { diff --git a/google-beta/services/resourcemanager/data_source_google_service_account_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_test.go index 30d008c3ba..283b4a383c 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_test.go +++ b/google-beta/services/resourcemanager/data_source_google_service_account_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/resource_google_billing_subaccount_test.go b/google-beta/services/resourcemanager/resource_google_billing_subaccount_test.go index b381cdea06..c9ad19cfab 100644 --- a/google-beta/services/resourcemanager/resource_google_billing_subaccount_test.go +++ b/google-beta/services/resourcemanager/resource_google_billing_subaccount_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccBillingSubaccount_renameOnDestroy(t *testing.T) { diff --git a/google-beta/services/resourcemanager/resource_google_folder_iam_audit_config_test.go b/google-beta/services/resourcemanager/resource_google_folder_iam_audit_config_test.go index fcf5b27f98..d42a0fbb59 100644 --- a/google-beta/services/resourcemanager/resource_google_folder_iam_audit_config_test.go +++ b/google-beta/services/resourcemanager/resource_google_folder_iam_audit_config_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) // Test that an IAM audit config can be applied to a folder diff --git a/google-beta/services/resourcemanager/resource_google_folder_iam_binding_test.go b/google-beta/services/resourcemanager/resource_google_folder_iam_binding_test.go index 70e7d229d7..a373efdf54 100644 --- a/google-beta/services/resourcemanager/resource_google_folder_iam_binding_test.go +++ b/google-beta/services/resourcemanager/resource_google_folder_iam_binding_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" resourceManagerV3 "google.golang.org/api/cloudresourcemanager/v3" ) diff --git a/google-beta/services/resourcemanager/resource_google_folder_iam_member_test.go b/google-beta/services/resourcemanager/resource_google_folder_iam_member_test.go index 9119f38a28..c676691a11 100644 --- a/google-beta/services/resourcemanager/resource_google_folder_iam_member_test.go +++ b/google-beta/services/resourcemanager/resource_google_folder_iam_member_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "google.golang.org/api/cloudresourcemanager/v1" diff --git a/google-beta/services/resourcemanager/resource_google_folder_iam_policy_test.go b/google-beta/services/resourcemanager/resource_google_folder_iam_policy_test.go index 00eb4de3d1..986fc1192c 100644 --- a/google-beta/services/resourcemanager/resource_google_folder_iam_policy_test.go +++ b/google-beta/services/resourcemanager/resource_google_folder_iam_policy_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" resourceManagerV3 "google.golang.org/api/cloudresourcemanager/v3" diff --git a/google-beta/services/resourcemanager/resource_google_folder_organization_policy_test.go b/google-beta/services/resourcemanager/resource_google_folder_organization_policy_test.go index dde1a9d8bf..965abb0e0e 100644 --- a/google-beta/services/resourcemanager/resource_google_folder_organization_policy_test.go +++ b/google-beta/services/resourcemanager/resource_google_folder_organization_policy_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/resourcemanager/resource_google_folder_test.go b/google-beta/services/resourcemanager/resource_google_folder_test.go index 6786a95a1e..e7e7f15d77 100644 --- a/google-beta/services/resourcemanager/resource_google_folder_test.go +++ b/google-beta/services/resourcemanager/resource_google_folder_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/resourcemanager/resource_google_organization_iam_audit_config_test.go b/google-beta/services/resourcemanager/resource_google_organization_iam_audit_config_test.go index d00c9190dd..bbe9d9fda7 100644 --- a/google-beta/services/resourcemanager/resource_google_organization_iam_audit_config_test.go +++ b/google-beta/services/resourcemanager/resource_google_organization_iam_audit_config_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) var runOrgIamAuditConfigTestEnvVar = "TF_RUN_ORG_IAM_AUDIT_CONFIG" diff --git a/google-beta/services/resourcemanager/resource_google_organization_iam_custom_role_test.go b/google-beta/services/resourcemanager/resource_google_organization_iam_custom_role_test.go index 7ff938afef..61a58a8bff 100644 --- a/google-beta/services/resourcemanager/resource_google_organization_iam_custom_role_test.go +++ b/google-beta/services/resourcemanager/resource_google_organization_iam_custom_role_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccOrganizationIamCustomRole_basic(t *testing.T) { diff --git a/google-beta/services/resourcemanager/resource_google_organization_iam_test.go b/google-beta/services/resourcemanager/resource_google_organization_iam_test.go index c0d1b13710..95235682dd 100644 --- a/google-beta/services/resourcemanager/resource_google_organization_iam_test.go +++ b/google-beta/services/resourcemanager/resource_google_organization_iam_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/resourcemanager/resource_google_organization_policy_test.go b/google-beta/services/resourcemanager/resource_google_organization_policy_test.go index 13f4b11147..11b7e00927 100644 --- a/google-beta/services/resourcemanager/resource_google_organization_policy_test.go +++ b/google-beta/services/resourcemanager/resource_google_organization_policy_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/resourcemanager/resource_google_project_default_service_accounts_test.go b/google-beta/services/resourcemanager/resource_google_project_default_service_accounts_test.go index 33f935da15..389ab055e9 100644 --- a/google-beta/services/resourcemanager/resource_google_project_default_service_accounts_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_default_service_accounts_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_audit_config_test.go b/google-beta/services/resourcemanager/resource_google_project_iam_audit_config_test.go index f3f2e78e68..3d37691be4 100644 --- a/google-beta/services/resourcemanager/resource_google_project_iam_audit_config_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_iam_audit_config_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamAuditConfigImportStep(resourceName, pid, service string) resource.TestStep { diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_binding_test.go b/google-beta/services/resourcemanager/resource_google_project_iam_binding_test.go index cf5d7557cb..ea12cc2891 100644 --- a/google-beta/services/resourcemanager/resource_google_project_iam_binding_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_iam_binding_test.go @@ -9,7 +9,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamBindingImportStep(resourceName, pid, role string) resource.TestStep { diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_custom_role_test.go b/google-beta/services/resourcemanager/resource_google_project_iam_custom_role_test.go index b0f308fa54..63ae2cc937 100644 --- a/google-beta/services/resourcemanager/resource_google_project_iam_custom_role_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_iam_custom_role_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_member_remove_test.go b/google-beta/services/resourcemanager/resource_google_project_iam_member_remove_test.go index df7ff371ef..bcca8b68cb 100644 --- a/google-beta/services/resourcemanager/resource_google_project_iam_member_remove_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_iam_member_remove_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccProjectIamMemberRemove_basic(t *testing.T) { diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_member_test.go b/google-beta/services/resourcemanager/resource_google_project_iam_member_test.go index 8ad34fd113..18d626a565 100644 --- a/google-beta/services/resourcemanager/resource_google_project_iam_member_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_iam_member_test.go @@ -9,7 +9,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func projectIamMemberImportStep(resourceName, pid, role, member string) resource.TestStep { diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_policy_test.go b/google-beta/services/resourcemanager/resource_google_project_iam_policy_test.go index a4a16a74b9..5c25f8c129 100644 --- a/google-beta/services/resourcemanager/resource_google_project_iam_policy_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_iam_policy_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/resourcemanager/resource_google_project_organization_policy_test.go b/google-beta/services/resourcemanager/resource_google_project_organization_policy_test.go index 4d00e6fc6e..1a549e1cf4 100644 --- a/google-beta/services/resourcemanager/resource_google_project_organization_policy_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_organization_policy_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/resourcemanager/resource_google_project_service_test.go b/google-beta/services/resourcemanager/resource_google_project_service_test.go index 094a536274..bcf5a61b33 100644 --- a/google-beta/services/resourcemanager/resource_google_project_service_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_service_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) // Test that services can be enabled and disabled on a project diff --git a/google-beta/services/resourcemanager/resource_google_project_test.go b/google-beta/services/resourcemanager/resource_google_project_test.go index 973093e7c6..eba627efef 100644 --- a/google-beta/services/resourcemanager/resource_google_project_test.go +++ b/google-beta/services/resourcemanager/resource_google_project_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" diff --git a/google-beta/services/resourcemanager/resource_google_service_account_iam_test.go b/google-beta/services/resourcemanager/resource_google_service_account_iam_test.go index 1bb3e93256..e26b09eb80 100644 --- a/google-beta/services/resourcemanager/resource_google_service_account_iam_test.go +++ b/google-beta/services/resourcemanager/resource_google_service_account_iam_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgiamresource" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccServiceAccountIamBinding(t *testing.T) { diff --git a/google-beta/services/resourcemanager/resource_google_service_account_key_test.go b/google-beta/services/resourcemanager/resource_google_service_account_key_test.go index cbac3aefff..5c62456aa0 100644 --- a/google-beta/services/resourcemanager/resource_google_service_account_key_test.go +++ b/google-beta/services/resourcemanager/resource_google_service_account_key_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/resourcemanager/resource_google_service_account_test.go b/google-beta/services/resourcemanager/resource_google_service_account_test.go index 4c902847ce..d30072799c 100644 --- a/google-beta/services/resourcemanager/resource_google_service_account_test.go +++ b/google-beta/services/resourcemanager/resource_google_service_account_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/resourcemanager/resource_project_service_identity_test.go b/google-beta/services/resourcemanager/resource_project_service_identity_test.go index e6399540a8..f661ef788c 100644 --- a/google-beta/services/resourcemanager/resource_project_service_identity_test.go +++ b/google-beta/services/resourcemanager/resource_project_service_identity_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccProjectServiceIdentity_basic(t *testing.T) { diff --git a/google-beta/services/resourcemanager/resource_resourcemanager_lien_test.go b/google-beta/services/resourcemanager/resource_resourcemanager_lien_test.go index 8e7eb2085e..674415185d 100644 --- a/google-beta/services/resourcemanager/resource_resourcemanager_lien_test.go +++ b/google-beta/services/resourcemanager/resource_resourcemanager_lien_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" resourceManager "google.golang.org/api/cloudresourcemanager/v1" ) diff --git a/google-beta/services/runtimeconfig/data_source_runtimeconfig_config_test.go b/google-beta/services/runtimeconfig/data_source_runtimeconfig_config_test.go index 2798a4b4ed..494a6e6e45 100644 --- a/google-beta/services/runtimeconfig/data_source_runtimeconfig_config_test.go +++ b/google-beta/services/runtimeconfig/data_source_runtimeconfig_config_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/runtimeconfig/data_source_runtimeconfig_variable_test.go b/google-beta/services/runtimeconfig/data_source_runtimeconfig_variable_test.go index 926b441a6a..3660e4a344 100644 --- a/google-beta/services/runtimeconfig/data_source_runtimeconfig_variable_test.go +++ b/google-beta/services/runtimeconfig/data_source_runtimeconfig_variable_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/runtimeconfig/iam_runtimeconfig_config_generated_test.go b/google-beta/services/runtimeconfig/iam_runtimeconfig_config_generated_test.go index efb95a4c63..3e4d9a06f1 100644 --- a/google-beta/services/runtimeconfig/iam_runtimeconfig_config_generated_test.go +++ b/google-beta/services/runtimeconfig/iam_runtimeconfig_config_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/runtimeconfig/resource_runtimeconfig_config_test.go b/google-beta/services/runtimeconfig/resource_runtimeconfig_config_test.go index afabdeff3d..d8cf23d9fc 100644 --- a/google-beta/services/runtimeconfig/resource_runtimeconfig_config_test.go +++ b/google-beta/services/runtimeconfig/resource_runtimeconfig_config_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1" ) diff --git a/google-beta/services/runtimeconfig/resource_runtimeconfig_variable_test.go b/google-beta/services/runtimeconfig/resource_runtimeconfig_variable_test.go index bc00dd0330..b235476f77 100644 --- a/google-beta/services/runtimeconfig/resource_runtimeconfig_variable_test.go +++ b/google-beta/services/runtimeconfig/resource_runtimeconfig_variable_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1" ) diff --git a/google-beta/services/secretmanager/data_source_secret_manager_secret_test.go b/google-beta/services/secretmanager/data_source_secret_manager_secret_test.go index abcd8cb777..caaca4860a 100644 --- a/google-beta/services/secretmanager/data_source_secret_manager_secret_test.go +++ b/google-beta/services/secretmanager/data_source_secret_manager_secret_test.go @@ -5,7 +5,7 @@ package secretmanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/secretmanager/data_source_secret_manager_secret_version_access_test.go b/google-beta/services/secretmanager/data_source_secret_manager_secret_version_access_test.go index 6509413a15..28ee96ab38 100644 --- a/google-beta/services/secretmanager/data_source_secret_manager_secret_version_access_test.go +++ b/google-beta/services/secretmanager/data_source_secret_manager_secret_version_access_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDatasourceSecretManagerSecretVersionAccess_basic(t *testing.T) { diff --git a/google-beta/services/secretmanager/data_source_secret_manager_secret_version_test.go b/google-beta/services/secretmanager/data_source_secret_manager_secret_version_test.go index 18a4eb03ff..5aeb129e64 100644 --- a/google-beta/services/secretmanager/data_source_secret_manager_secret_version_test.go +++ b/google-beta/services/secretmanager/data_source_secret_manager_secret_version_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccDatasourceSecretManagerSecretVersion_basic(t *testing.T) { diff --git a/google-beta/services/secretmanager/data_source_secret_manager_secrets_test.go b/google-beta/services/secretmanager/data_source_secret_manager_secrets_test.go index 9fdaf7ed37..a17f259c1c 100644 --- a/google-beta/services/secretmanager/data_source_secret_manager_secrets_test.go +++ b/google-beta/services/secretmanager/data_source_secret_manager_secrets_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/secretmanager/iam_secret_manager_secret_generated_test.go b/google-beta/services/secretmanager/iam_secret_manager_secret_generated_test.go index 494d5d95b8..0057737a96 100644 --- a/google-beta/services/secretmanager/iam_secret_manager_secret_generated_test.go +++ b/google-beta/services/secretmanager/iam_secret_manager_secret_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/secretmanager/iam_secret_manager_secret_test.go b/google-beta/services/secretmanager/iam_secret_manager_secret_test.go index 59d05d6b0c..951741102b 100644 --- a/google-beta/services/secretmanager/iam_secret_manager_secret_test.go +++ b/google-beta/services/secretmanager/iam_secret_manager_secret_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go b/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go index 8d72981386..dff0094173 100644 --- a/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go +++ b/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_test.go b/google-beta/services/secretmanager/resource_secret_manager_secret_test.go index 3905bbf1f1..03138ce902 100644 --- a/google-beta/services/secretmanager/resource_secret_manager_secret_test.go +++ b/google-beta/services/secretmanager/resource_secret_manager_secret_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecretManagerSecret_import(t *testing.T) { diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go b/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go index 5d563fc85f..fe248bdf6a 100644 --- a/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go +++ b/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_version_test.go b/google-beta/services/secretmanager/resource_secret_manager_secret_version_test.go index dd6ab24f22..03d404a9c6 100644 --- a/google-beta/services/secretmanager/resource_secret_manager_secret_version_test.go +++ b/google-beta/services/secretmanager/resource_secret_manager_secret_version_test.go @@ -5,7 +5,7 @@ package secretmanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/securesourcemanager/iam_secure_source_manager_instance_generated_test.go b/google-beta/services/securesourcemanager/iam_secure_source_manager_instance_generated_test.go index 7d315757ab..e4b571fec9 100644 --- a/google-beta/services/securesourcemanager/iam_secure_source_manager_instance_generated_test.go +++ b/google-beta/services/securesourcemanager/iam_secure_source_manager_instance_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securesourcemanager/iam_secure_source_manager_repository_generated_test.go b/google-beta/services/securesourcemanager/iam_secure_source_manager_repository_generated_test.go index 596be79cb8..d1ea20d195 100644 --- a/google-beta/services/securesourcemanager/iam_secure_source_manager_repository_generated_test.go +++ b/google-beta/services/securesourcemanager/iam_secure_source_manager_repository_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go b/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go index ed0837a9c0..6b5d27efce 100644 --- a/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go +++ b/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go b/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go index 6c7765cd25..96fcdb50fe 100644 --- a/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go +++ b/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/securitycenter/iam_scc_source_test.go b/google-beta/services/securitycenter/iam_scc_source_test.go index 6c8669506c..14b9553f5e 100644 --- a/google-beta/services/securitycenter/iam_scc_source_test.go +++ b/google-beta/services/securitycenter/iam_scc_source_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go b/google-beta/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go index 75d4998fc2..6b36f66f1e 100644 --- a/google-beta/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go +++ b/google-beta/services/securitycenter/resource_scc_event_threat_detection_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenter/resource_scc_folder_custom_module_test.go b/google-beta/services/securitycenter/resource_scc_folder_custom_module_test.go index cccaa28a0c..dfdf15d5d9 100644 --- a/google-beta/services/securitycenter/resource_scc_folder_custom_module_test.go +++ b/google-beta/services/securitycenter/resource_scc_folder_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go b/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go index 7fbcf40e5b..3d9274a76a 100644 --- a/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go +++ b/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go b/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go index 03322ebb10..3c1c2d3956 100644 --- a/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go +++ b/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenter/resource_scc_notification_config_test.go b/google-beta/services/securitycenter/resource_scc_notification_config_test.go index 41797cb6be..646ae29a9b 100644 --- a/google-beta/services/securitycenter/resource_scc_notification_config_test.go +++ b/google-beta/services/securitycenter/resource_scc_notification_config_test.go @@ -5,7 +5,7 @@ package securitycenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/securitycenter/resource_scc_organization_custom_module_test.go b/google-beta/services/securitycenter/resource_scc_organization_custom_module_test.go index 355a39f14f..b7eb7f10d1 100644 --- a/google-beta/services/securitycenter/resource_scc_organization_custom_module_test.go +++ b/google-beta/services/securitycenter/resource_scc_organization_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenter/resource_scc_project_custom_module_test.go b/google-beta/services/securitycenter/resource_scc_project_custom_module_test.go index bb337532e8..304d19556b 100644 --- a/google-beta/services/securitycenter/resource_scc_project_custom_module_test.go +++ b/google-beta/services/securitycenter/resource_scc_project_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go b/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go index 6325a752de..cd829967dd 100644 --- a/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go +++ b/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenter/resource_scc_project_notification_config_test.go b/google-beta/services/securitycenter/resource_scc_project_notification_config_test.go index 1762703468..ee2c43cfdd 100644 --- a/google-beta/services/securitycenter/resource_scc_project_notification_config_test.go +++ b/google-beta/services/securitycenter/resource_scc_project_notification_config_test.go @@ -5,7 +5,7 @@ package securitycenter_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/securitycenter/resource_scc_source_test.go b/google-beta/services/securitycenter/resource_scc_source_test.go index ff982c2a85..54ca95f1fc 100644 --- a/google-beta/services/securitycenter/resource_scc_source_test.go +++ b/google-beta/services/securitycenter/resource_scc_source_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go b/google-beta/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go index 2d266b37fa..4d4d7eab4b 100644 --- a/google-beta/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go +++ b/google-beta/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go b/google-beta/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go index cd7c6f91d2..d7ef55ee8c 100644 --- a/google-beta/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go +++ b/google-beta/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go b/google-beta/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go index 415bcdc8d4..cf35f23664 100644 --- a/google-beta/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go +++ b/google-beta/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go b/google-beta/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go index 4eb697047b..6c40dadbe2 100644 --- a/google-beta/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go +++ b/google-beta/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go index 49e554b2f5..3ae4720820 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go index 13141de8bc..ac63c920c2 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_test.go @@ -5,7 +5,7 @@ package securitycenterv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go index 394c492305..ee6cecc34d 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go index e85ad22025..8c9a170c6c 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_test.go @@ -5,7 +5,7 @@ package securitycenterv2_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/securityposture/resource_securityposture_posture_deployment_test.go b/google-beta/services/securityposture/resource_securityposture_posture_deployment_test.go index 125744fadd..7925b763fe 100644 --- a/google-beta/services/securityposture/resource_securityposture_posture_deployment_test.go +++ b/google-beta/services/securityposture/resource_securityposture_posture_deployment_test.go @@ -5,7 +5,7 @@ package securityposture_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go b/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go index bbe6e01229..bb1d6fe308 100644 --- a/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go +++ b/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securityposture/resource_securityposture_posture_test.go b/google-beta/services/securityposture/resource_securityposture_posture_test.go index 3cc4a54d08..73b6e51655 100644 --- a/google-beta/services/securityposture/resource_securityposture_posture_test.go +++ b/google-beta/services/securityposture/resource_securityposture_posture_test.go @@ -5,7 +5,7 @@ package securityposture_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go b/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go index 6bb6c71031..0e5bd6a43f 100644 --- a/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go +++ b/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/securityscanner/resource_security_scanner_scan_config_test.go b/google-beta/services/securityscanner/resource_security_scanner_scan_config_test.go index c188edb9d1..2e0b5e9108 100644 --- a/google-beta/services/securityscanner/resource_security_scanner_scan_config_test.go +++ b/google-beta/services/securityscanner/resource_security_scanner_scan_config_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccSecurityScannerScanConfig_scanConfigUpdate(t *testing.T) { diff --git a/google-beta/services/servicedirectory/iam_service_directory_namespace_generated_test.go b/google-beta/services/servicedirectory/iam_service_directory_namespace_generated_test.go index 532b39e7c2..a10e6503d6 100644 --- a/google-beta/services/servicedirectory/iam_service_directory_namespace_generated_test.go +++ b/google-beta/services/servicedirectory/iam_service_directory_namespace_generated_test.go @@ -20,7 +20,7 @@ package servicedirectory_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/servicedirectory/iam_service_directory_service_generated_test.go b/google-beta/services/servicedirectory/iam_service_directory_service_generated_test.go index b85509fdf7..6724e34141 100644 --- a/google-beta/services/servicedirectory/iam_service_directory_service_generated_test.go +++ b/google-beta/services/servicedirectory/iam_service_directory_service_generated_test.go @@ -20,7 +20,7 @@ package servicedirectory_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go b/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go index 49828baa22..b4839cd5b0 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/servicedirectory/resource_service_directory_endpoint_test.go b/google-beta/services/servicedirectory/resource_service_directory_endpoint_test.go index 16277c312e..2a06705827 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_endpoint_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_endpoint_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryEndpoint_serviceDirectoryEndpointUpdateExample(t *testing.T) { diff --git a/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go b/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go index 985ffe4f0b..66a0a039b4 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/servicedirectory/resource_service_directory_namespace_test.go b/google-beta/services/servicedirectory/resource_service_directory_namespace_test.go index b2c1e1e271..9b62d39fb2 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_namespace_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_namespace_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryNamespace_serviceDirectoryNamespaceUpdateExample(t *testing.T) { diff --git a/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go b/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go index 82ea35e722..f265cd5638 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/servicedirectory/resource_service_directory_service_test.go b/google-beta/services/servicedirectory/resource_service_directory_service_test.go index ecd15e5eda..92711faf64 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_service_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_service_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceDirectoryService_serviceDirectoryServiceUpdateExample(t *testing.T) { diff --git a/google-beta/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go b/google-beta/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go index 84f5eb57a7..2705dc6cb9 100644 --- a/google-beta/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go +++ b/google-beta/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/servicemanagement/iam_endpoints_service_generated_test.go b/google-beta/services/servicemanagement/iam_endpoints_service_generated_test.go index 1bfde12e56..e2368c60d4 100644 --- a/google-beta/services/servicemanagement/iam_endpoints_service_generated_test.go +++ b/google-beta/services/servicemanagement/iam_endpoints_service_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/servicemanagement/resource_endpoints_service_test.go b/google-beta/services/servicemanagement/resource_endpoints_service_test.go index 7928321c23..8eb0d8702f 100644 --- a/google-beta/services/servicemanagement/resource_endpoints_service_test.go +++ b/google-beta/services/servicemanagement/resource_endpoints_service_test.go @@ -11,8 +11,8 @@ import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go b/google-beta/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go index 0a1bb5fac3..b40d5967aa 100644 --- a/google-beta/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go +++ b/google-beta/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go b/google-beta/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go index 717e983e31..6005a3b2fe 100644 --- a/google-beta/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go +++ b/google-beta/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/servicenetworking/resource_service_networking_connection_test.go b/google-beta/services/servicenetworking/resource_service_networking_connection_test.go index 8bc925c65f..e9bae696a0 100644 --- a/google-beta/services/servicenetworking/resource_service_networking_connection_test.go +++ b/google-beta/services/servicenetworking/resource_service_networking_connection_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go b/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go index de48a74039..11ed606537 100644 --- a/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go +++ b/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go @@ -20,7 +20,7 @@ package servicenetworking_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go b/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go index c3e1d219f1..66ae4945fa 100644 --- a/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go +++ b/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go b/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go index f3009952cc..cbf679aea9 100644 --- a/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go +++ b/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_test.go b/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_test.go index 584158135e..cce9074c70 100644 --- a/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_test.go +++ b/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccServiceUsageConsumerQuotaOverride_consumerQuotaOverrideCustomIncorrectLimitFormat(t *testing.T) { diff --git a/google-beta/services/siteverification/data_source_google_site_verification_token_test.go b/google-beta/services/siteverification/data_source_google_site_verification_token_test.go index ac2424591e..177fb2194c 100644 --- a/google-beta/services/siteverification/data_source_google_site_verification_token_test.go +++ b/google-beta/services/siteverification/data_source_google_site_verification_token_test.go @@ -7,7 +7,7 @@ package siteverification_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sourcerepo/data_source_sourcerepo_repository_test.go b/google-beta/services/sourcerepo/data_source_sourcerepo_repository_test.go index 4528f6c4d8..ba41347435 100644 --- a/google-beta/services/sourcerepo/data_source_sourcerepo_repository_test.go +++ b/google-beta/services/sourcerepo/data_source_sourcerepo_repository_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sourcerepo/iam_sourcerepo_repository_generated_test.go b/google-beta/services/sourcerepo/iam_sourcerepo_repository_generated_test.go index 0789e95fe7..a8c67d5a12 100644 --- a/google-beta/services/sourcerepo/iam_sourcerepo_repository_generated_test.go +++ b/google-beta/services/sourcerepo/iam_sourcerepo_repository_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go b/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go index 70c605a184..73979d30e0 100644 --- a/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go +++ b/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/sourcerepo/resource_sourcerepo_repository_test.go b/google-beta/services/sourcerepo/resource_sourcerepo_repository_test.go index d5882f4d6f..64b5df4809 100644 --- a/google-beta/services/sourcerepo/resource_sourcerepo_repository_test.go +++ b/google-beta/services/sourcerepo/resource_sourcerepo_repository_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/spanner/data_source_spanner_instance_test.go b/google-beta/services/spanner/data_source_spanner_instance_test.go index 63ac925cce..b980fa50d6 100644 --- a/google-beta/services/spanner/data_source_spanner_instance_test.go +++ b/google-beta/services/spanner/data_source_spanner_instance_test.go @@ -5,7 +5,7 @@ package spanner_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/spanner/iam_spanner_database_test.go b/google-beta/services/spanner/iam_spanner_database_test.go index 713b52db56..458a2ed894 100644 --- a/google-beta/services/spanner/iam_spanner_database_test.go +++ b/google-beta/services/spanner/iam_spanner_database_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" diff --git a/google-beta/services/spanner/iam_spanner_instance_test.go b/google-beta/services/spanner/iam_spanner_instance_test.go index 503fce92d1..55f4b553e0 100644 --- a/google-beta/services/spanner/iam_spanner_instance_test.go +++ b/google-beta/services/spanner/iam_spanner_instance_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" diff --git a/google-beta/services/spanner/resource_spanner_database_generated_test.go b/google-beta/services/spanner/resource_spanner_database_generated_test.go index 82bbc97b0e..843764b77a 100644 --- a/google-beta/services/spanner/resource_spanner_database_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_database_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/spanner/resource_spanner_database_test.go b/google-beta/services/spanner/resource_spanner_database_test.go index c0466c6114..631a90e627 100644 --- a/google-beta/services/spanner/resource_spanner_database_test.go +++ b/google-beta/services/spanner/resource_spanner_database_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go b/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go index b38a4b3862..64e2cfdb3a 100644 --- a/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/spanner/resource_spanner_instance_config_test.go b/google-beta/services/spanner/resource_spanner_instance_config_test.go index 4e40b519b3..7a6878537a 100644 --- a/google-beta/services/spanner/resource_spanner_instance_config_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) // Acceptance Tests diff --git a/google-beta/services/spanner/resource_spanner_instance_generated_test.go b/google-beta/services/spanner/resource_spanner_instance_generated_test.go index b8df7ccd47..a7f023bb03 100644 --- a/google-beta/services/spanner/resource_spanner_instance_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/spanner/resource_spanner_instance_test.go b/google-beta/services/spanner/resource_spanner_instance_test.go index cdef859e45..1692645b81 100644 --- a/google-beta/services/spanner/resource_spanner_instance_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) // Acceptance Tests diff --git a/google-beta/services/sql/data_source_google_sql_ca_certs_test.go b/google-beta/services/sql/data_source_google_sql_ca_certs_test.go index 892cec6c12..14d25352aa 100644 --- a/google-beta/services/sql/data_source_google_sql_ca_certs_test.go +++ b/google-beta/services/sql/data_source_google_sql_ca_certs_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/data_source_google_sql_tiers_test.go b/google-beta/services/sql/data_source_google_sql_tiers_test.go index 38a6fadf25..c1e00c265d 100644 --- a/google-beta/services/sql/data_source_google_sql_tiers_test.go +++ b/google-beta/services/sql/data_source_google_sql_tiers_test.go @@ -5,7 +5,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/data_source_sql_backup_run_test.go b/google-beta/services/sql/data_source_sql_backup_run_test.go index f7c13c3a39..7d58d8cd69 100644 --- a/google-beta/services/sql/data_source_sql_backup_run_test.go +++ b/google-beta/services/sql/data_source_sql_backup_run_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceSqlBackupRun_basic(t *testing.T) { diff --git a/google-beta/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go b/google-beta/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go index a68bc1b87b..cda98af21a 100644 --- a/google-beta/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go +++ b/google-beta/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go @@ -5,7 +5,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/data_source_sql_database_instance_test.go b/google-beta/services/sql/data_source_sql_database_instance_test.go index bf9600c980..5efbbb372f 100644 --- a/google-beta/services/sql/data_source_sql_database_instance_test.go +++ b/google-beta/services/sql/data_source_sql_database_instance_test.go @@ -5,7 +5,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/data_source_sql_database_instances_test.go b/google-beta/services/sql/data_source_sql_database_instances_test.go index 481ef10ea1..741e4f6ddd 100644 --- a/google-beta/services/sql/data_source_sql_database_instances_test.go +++ b/google-beta/services/sql/data_source_sql_database_instances_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/data_source_sql_database_test.go b/google-beta/services/sql/data_source_sql_database_test.go index e7d0975859..642f7fd104 100644 --- a/google-beta/services/sql/data_source_sql_database_test.go +++ b/google-beta/services/sql/data_source_sql_database_test.go @@ -5,7 +5,7 @@ package sql_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/data_source_sql_databases_test.go b/google-beta/services/sql/data_source_sql_databases_test.go index 903c9ee63e..550af6a2b4 100644 --- a/google-beta/services/sql/data_source_sql_databases_test.go +++ b/google-beta/services/sql/data_source_sql_databases_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/resource_sql_database_generated_test.go b/google-beta/services/sql/resource_sql_database_generated_test.go index 894ae93e7c..9de6adad7c 100644 --- a/google-beta/services/sql/resource_sql_database_generated_test.go +++ b/google-beta/services/sql/resource_sql_database_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/sql/resource_sql_database_instance_test.go b/google-beta/services/sql/resource_sql_database_instance_test.go index 20762576bd..cdb96bb595 100644 --- a/google-beta/services/sql/resource_sql_database_instance_test.go +++ b/google-beta/services/sql/resource_sql_database_instance_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/sql" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" sqladmin "google.golang.org/api/sqladmin/v1beta4" ) diff --git a/google-beta/services/sql/resource_sql_database_test.go b/google-beta/services/sql/resource_sql_database_test.go index 82714a2ce3..38ad57b040 100644 --- a/google-beta/services/sql/resource_sql_database_test.go +++ b/google-beta/services/sql/resource_sql_database_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go b/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go index d439fa14bb..c24cbe9b0d 100644 --- a/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go +++ b/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/sql/resource_sql_ssl_cert_test.go b/google-beta/services/sql/resource_sql_ssl_cert_test.go index a4361e65a9..24489b48b4 100644 --- a/google-beta/services/sql/resource_sql_ssl_cert_test.go +++ b/google-beta/services/sql/resource_sql_ssl_cert_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/sql/resource_sql_user_test.go b/google-beta/services/sql/resource_sql_user_test.go index d4d399ebd2..b62969a53c 100644 --- a/google-beta/services/sql/resource_sql_user_test.go +++ b/google-beta/services/sql/resource_sql_user_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/storage/data_source_google_storage_bucket_objects_test.go b/google-beta/services/storage/data_source_google_storage_bucket_objects_test.go index e1c1c01ba9..22dac1f458 100644 --- a/google-beta/services/storage/data_source_google_storage_bucket_objects_test.go +++ b/google-beta/services/storage/data_source_google_storage_bucket_objects_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/storage/data_source_google_storage_bucket_test.go b/google-beta/services/storage/data_source_google_storage_bucket_test.go index 712b1ed67e..456e33f77e 100644 --- a/google-beta/services/storage/data_source_google_storage_bucket_test.go +++ b/google-beta/services/storage/data_source_google_storage_bucket_test.go @@ -5,7 +5,7 @@ package storage_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/storage/data_source_google_storage_buckets_test.go b/google-beta/services/storage/data_source_google_storage_buckets_test.go index 461c4b2865..32f455036d 100644 --- a/google-beta/services/storage/data_source_google_storage_buckets_test.go +++ b/google-beta/services/storage/data_source_google_storage_buckets_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/storage/data_source_google_storage_project_service_account_test.go b/google-beta/services/storage/data_source_google_storage_project_service_account_test.go index 7edaa8ad01..0b699523b8 100644 --- a/google-beta/services/storage/data_source_google_storage_project_service_account_test.go +++ b/google-beta/services/storage/data_source_google_storage_project_service_account_test.go @@ -5,7 +5,7 @@ package storage_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storage/data_source_storage_bucket_object_content_test.go b/google-beta/services/storage/data_source_storage_bucket_object_content_test.go index 3dd541a93b..7365e0c5f7 100644 --- a/google-beta/services/storage/data_source_storage_bucket_object_content_test.go +++ b/google-beta/services/storage/data_source_storage_bucket_object_content_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storage/data_source_storage_object_signed_url_test.go b/google-beta/services/storage/data_source_storage_object_signed_url_test.go index b89761780c..ef01b54809 100644 --- a/google-beta/services/storage/data_source_storage_object_signed_url_test.go +++ b/google-beta/services/storage/data_source_storage_object_signed_url_test.go @@ -10,8 +10,8 @@ import ( "net/http" "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storage/iam_storage_bucket_generated_test.go b/google-beta/services/storage/iam_storage_bucket_generated_test.go index aa01a6c4fd..5c7de09483 100644 --- a/google-beta/services/storage/iam_storage_bucket_generated_test.go +++ b/google-beta/services/storage/iam_storage_bucket_generated_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/storage/iam_storage_managed_folder_test.go b/google-beta/services/storage/iam_storage_managed_folder_test.go index 39647b9fd1..66c22dcc01 100644 --- a/google-beta/services/storage/iam_storage_managed_folder_test.go +++ b/google-beta/services/storage/iam_storage_managed_folder_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go b/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go index af7bbbc29d..d06a42ef5f 100644 --- a/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go +++ b/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/storage/resource_storage_bucket_access_control_test.go b/google-beta/services/storage/resource_storage_bucket_access_control_test.go index 1d3fff86d5..769aca1644 100644 --- a/google-beta/services/storage/resource_storage_bucket_access_control_test.go +++ b/google-beta/services/storage/resource_storage_bucket_access_control_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storage/resource_storage_bucket_acl_test.go b/google-beta/services/storage/resource_storage_bucket_acl_test.go index 26232a4a21..098b6cef8d 100644 --- a/google-beta/services/storage/resource_storage_bucket_acl_test.go +++ b/google-beta/services/storage/resource_storage_bucket_acl_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var ( diff --git a/google-beta/services/storage/resource_storage_bucket_iam_test.go b/google-beta/services/storage/resource_storage_bucket_iam_test.go index 679d5588cb..9bfc2cd3dc 100644 --- a/google-beta/services/storage/resource_storage_bucket_iam_test.go +++ b/google-beta/services/storage/resource_storage_bucket_iam_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/storage/resource_storage_bucket_object_test.go b/google-beta/services/storage/resource_storage_bucket_object_test.go index 809344172f..8232457bb3 100644 --- a/google-beta/services/storage/resource_storage_bucket_object_test.go +++ b/google-beta/services/storage/resource_storage_bucket_object_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "os" diff --git a/google-beta/services/storage/resource_storage_bucket_test.go b/google-beta/services/storage/resource_storage_bucket_test.go index e2e1f9e610..c9058cd6fb 100644 --- a/google-beta/services/storage/resource_storage_bucket_test.go +++ b/google-beta/services/storage/resource_storage_bucket_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go b/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go index 13ad2c222f..fcbaca41b4 100644 --- a/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go +++ b/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/storage/resource_storage_default_object_access_control_test.go b/google-beta/services/storage/resource_storage_default_object_access_control_test.go index efb1d4e9d2..cd6310f1d7 100644 --- a/google-beta/services/storage/resource_storage_default_object_access_control_test.go +++ b/google-beta/services/storage/resource_storage_default_object_access_control_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storage/resource_storage_default_object_acl_test.go b/google-beta/services/storage/resource_storage_default_object_acl_test.go index c77d15951e..1ff7e39cf6 100644 --- a/google-beta/services/storage/resource_storage_default_object_acl_test.go +++ b/google-beta/services/storage/resource_storage_default_object_acl_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" ) diff --git a/google-beta/services/storage/resource_storage_hmac_key_generated_test.go b/google-beta/services/storage/resource_storage_hmac_key_generated_test.go index 138a013ab4..e1ca046782 100644 --- a/google-beta/services/storage/resource_storage_hmac_key_generated_test.go +++ b/google-beta/services/storage/resource_storage_hmac_key_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/storage/resource_storage_hmac_key_test.go b/google-beta/services/storage/resource_storage_hmac_key_test.go index 7dfdd2334e..91878f0106 100644 --- a/google-beta/services/storage/resource_storage_hmac_key_test.go +++ b/google-beta/services/storage/resource_storage_hmac_key_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storage/resource_storage_managed_folder_generated_test.go b/google-beta/services/storage/resource_storage_managed_folder_generated_test.go index 864db66e2b..f6b050f3ea 100644 --- a/google-beta/services/storage/resource_storage_managed_folder_generated_test.go +++ b/google-beta/services/storage/resource_storage_managed_folder_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/storage/resource_storage_notification_test.go b/google-beta/services/storage/resource_storage_notification_test.go index 01ff8708d1..0602d29b2e 100644 --- a/google-beta/services/storage/resource_storage_notification_test.go +++ b/google-beta/services/storage/resource_storage_notification_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgstorage "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "google.golang.org/api/storage/v1" ) diff --git a/google-beta/services/storage/resource_storage_object_access_control_generated_test.go b/google-beta/services/storage/resource_storage_object_access_control_generated_test.go index a6fd279fe3..865d8954c5 100644 --- a/google-beta/services/storage/resource_storage_object_access_control_generated_test.go +++ b/google-beta/services/storage/resource_storage_object_access_control_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/storage/resource_storage_object_access_control_test.go b/google-beta/services/storage/resource_storage_object_access_control_test.go index 3d668a5bf6..05b5e2e3e9 100644 --- a/google-beta/services/storage/resource_storage_object_access_control_test.go +++ b/google-beta/services/storage/resource_storage_object_access_control_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccStorageObjectAccessControl_update(t *testing.T) { diff --git a/google-beta/services/storage/resource_storage_object_acl_test.go b/google-beta/services/storage/resource_storage_object_acl_test.go index 43bbdc5dce..e225d18f8a 100644 --- a/google-beta/services/storage/resource_storage_object_acl_test.go +++ b/google-beta/services/storage/resource_storage_object_acl_test.go @@ -18,9 +18,9 @@ import ( transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" ) var tfObjectAcl, errObjectAcl = ioutil.TempFile("", "tf-gce-test") diff --git a/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go b/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go index 79261a91aa..d02a5e8107 100644 --- a/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go +++ b/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/storageinsights/resource_storage_insights_report_config_test.go b/google-beta/services/storageinsights/resource_storage_insights_report_config_test.go index 4aafe59a86..adfaf9ba64 100644 --- a/google-beta/services/storageinsights/resource_storage_insights_report_config_test.go +++ b/google-beta/services/storageinsights/resource_storage_insights_report_config_test.go @@ -7,7 +7,7 @@ package storageinsights_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go b/google-beta/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go index b45e073928..48de0a5537 100644 --- a/google-beta/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go +++ b/google-beta/services/storagetransfer/data_source_google_storage_transfer_project_service_account_test.go @@ -5,7 +5,7 @@ package storagetransfer_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/storagetransfer/resource_storage_transfer_agent_pool_test.go b/google-beta/services/storagetransfer/resource_storage_transfer_agent_pool_test.go index d164558b63..816baced28 100644 --- a/google-beta/services/storagetransfer/resource_storage_transfer_agent_pool_test.go +++ b/google-beta/services/storagetransfer/resource_storage_transfer_agent_pool_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go b/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go index 681014adb5..5b4aceeca0 100644 --- a/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go +++ b/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/tags/data_source_tags_tag_key_test.go b/google-beta/services/tags/data_source_tags_tag_key_test.go index cd06c90ee3..b1f960db0a 100644 --- a/google-beta/services/tags/data_source_tags_tag_key_test.go +++ b/google-beta/services/tags/data_source_tags_tag_key_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/tags/data_source_tags_tag_keys_test.go b/google-beta/services/tags/data_source_tags_tag_keys_test.go index ab9cef9b1a..cf66e03a54 100644 --- a/google-beta/services/tags/data_source_tags_tag_keys_test.go +++ b/google-beta/services/tags/data_source_tags_tag_keys_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/tags/data_source_tags_tag_value_test.go b/google-beta/services/tags/data_source_tags_tag_value_test.go index ce719ec203..500b383046 100644 --- a/google-beta/services/tags/data_source_tags_tag_value_test.go +++ b/google-beta/services/tags/data_source_tags_tag_value_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/tags/data_source_tags_tag_values_test.go b/google-beta/services/tags/data_source_tags_tag_values_test.go index 613ae03b4c..2b596d7990 100644 --- a/google-beta/services/tags/data_source_tags_tag_values_test.go +++ b/google-beta/services/tags/data_source_tags_tag_values_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/tags/resource_tags_test.go b/google-beta/services/tags/resource_tags_test.go index a89756491e..72bc983673 100644 --- a/google-beta/services/tags/resource_tags_test.go +++ b/google-beta/services/tags/resource_tags_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/tpu/data_source_tpu_tensorflow_versions_test.go b/google-beta/services/tpu/data_source_tpu_tensorflow_versions_test.go index fbe0a27119..a10c986fc0 100644 --- a/google-beta/services/tpu/data_source_tpu_tensorflow_versions_test.go +++ b/google-beta/services/tpu/data_source_tpu_tensorflow_versions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/tpu/resource_tpu_node_generated_test.go b/google-beta/services/tpu/resource_tpu_node_generated_test.go index f3ee64d421..d83c37cec4 100644 --- a/google-beta/services/tpu/resource_tpu_node_generated_test.go +++ b/google-beta/services/tpu/resource_tpu_node_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/tpu/resource_tpu_node_test.go b/google-beta/services/tpu/resource_tpu_node_test.go index 7ce71adc56..a3e7da38d8 100644 --- a/google-beta/services/tpu/resource_tpu_node_test.go +++ b/google-beta/services/tpu/resource_tpu_node_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccTPUNode_tpuNodeBUpdateTensorFlowVersion(t *testing.T) { diff --git a/google-beta/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go b/google-beta/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go index 34ecff2c28..feb1ad302f 100644 --- a/google-beta/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go +++ b/google-beta/services/tpuv2/data_source_tpu_v2_accelerator_types_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go b/google-beta/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go index 1d54836ca8..0ee6175467 100644 --- a/google-beta/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go +++ b/google-beta/services/tpuv2/data_source_tpu_v2_runtime_versions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go b/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go index fa4406c9c5..324187c4d3 100644 --- a/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go +++ b/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/tpuv2/resource_tpu_v2_vm_test.go b/google-beta/services/tpuv2/resource_tpu_v2_vm_test.go index 11540037a2..2a4e3cc9e4 100644 --- a/google-beta/services/tpuv2/resource_tpu_v2_vm_test.go +++ b/google-beta/services/tpuv2/resource_tpu_v2_vm_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vertexai/data_source_vertex_ai_index_test.go b/google-beta/services/vertexai/data_source_vertex_ai_index_test.go index ce91e00591..3fbae22033 100644 --- a/google-beta/services/vertexai/data_source_vertex_ai_index_test.go +++ b/google-beta/services/vertexai/data_source_vertex_ai_index_test.go @@ -5,7 +5,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vertexai/iam_vertex_ai_featurestore_entitytype_generated_test.go b/google-beta/services/vertexai/iam_vertex_ai_featurestore_entitytype_generated_test.go index b7c491170a..0da5c29bd4 100644 --- a/google-beta/services/vertexai/iam_vertex_ai_featurestore_entitytype_generated_test.go +++ b/google-beta/services/vertexai/iam_vertex_ai_featurestore_entitytype_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/iam_vertex_ai_featurestore_generated_test.go b/google-beta/services/vertexai/iam_vertex_ai_featurestore_generated_test.go index e6c3e95254..e787d57ebb 100644 --- a/google-beta/services/vertexai/iam_vertex_ai_featurestore_generated_test.go +++ b/google-beta/services/vertexai/iam_vertex_ai_featurestore_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/iam_vertex_endpoint_test.go b/google-beta/services/vertexai/iam_vertex_endpoint_test.go index 80118ae20c..a41d17e865 100644 --- a/google-beta/services/vertexai/iam_vertex_endpoint_test.go +++ b/google-beta/services/vertexai/iam_vertex_endpoint_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go index a6deef63b3..e5e41bd903 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go index 5b0c5029dc..f154041d3e 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_endpoint_test.go b/google-beta/services/vertexai/resource_vertex_ai_endpoint_test.go index d449b2685d..c66a358f80 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_endpoint_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_endpoint_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go index d38b3b4e25..2630344d37 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_test.go index 221429df81..bed069667c 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_test.go @@ -5,7 +5,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go index 846f6e2421..485909f629 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_group_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_group_test.go index 33180c6e2f..079043b797 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_group_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_group_test.go @@ -5,7 +5,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go index 46df85b938..9ac556f35d 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go index b75ee5a4b4..de640ecbb3 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_test.go @@ -8,7 +8,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go index 945caf2e3c..25571805f9 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_test.go index 0adfc01957..39ad5e97c9 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_test.go @@ -5,7 +5,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go index e208e02e2b..b2885a3609 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go index 2fb785d67a..e7c30e5e83 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go index 7a2bf2266f..4075ff05b8 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go index 6dc1515c8e..c8da5dfff7 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_test.go index aec076b893..628dedfcd5 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_test.go @@ -5,7 +5,7 @@ package vertexai_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go index 551046da3a..a482648cd4 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_test.go index 982db1a3b2..34a262b2df 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_metadata_store_test.go b/google-beta/services/vertexai/resource_vertex_ai_metadata_store_test.go index 64c30faf05..b1c0f19a14 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_metadata_store_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_metadata_store_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go index 8e0b551869..3c0e66c4f5 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vertexai/resource_vertex_ai_tensorboard_test.go b/google-beta/services/vertexai/resource_vertex_ai_tensorboard_test.go index 263fd8a216..3e90247256 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_tensorboard_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_tensorboard_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go b/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go index b9e0b22fd5..b3d7319775 100644 --- a/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go +++ b/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go b/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go index 969618b104..af9081964d 100644 --- a/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go +++ b/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_test.go b/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_test.go index ec24dc7e35..75b1401ab9 100644 --- a/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_test.go +++ b/google-beta/services/vmwareengine/data_source_google_vmwareengine_network_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go index 123ebffc5a..86ef3522f0 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go index bb11476140..34c5bf9168 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_external_access_rule_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_external_address_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_external_address_test.go index be71e3ed4c..563fd13d57 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_external_address_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_external_address_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go index b390fa5389..59471598ab 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go index b44842750e..f52b180506 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_test.go index 2a16cca481..cb5c755315 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go index 8dca1300a4..f7903e02f2 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_test.go index 4db0b7da69..c01b4311ff 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_test.go index 86170ba5ea..70a6059b33 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" ) diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_private_cloud_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_private_cloud_test.go index e9bf27af6e..7fd474a516 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_private_cloud_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_private_cloud_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_subnet_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_subnet_test.go index cd32ec5ba0..d035d0d7ce 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_subnet_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_subnet_test.go @@ -5,7 +5,7 @@ package vmwareengine_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vpcaccess/data_source_vpc_access_connector_test.go b/google-beta/services/vpcaccess/data_source_vpc_access_connector_test.go index dee2110cd2..c3800d15b6 100644 --- a/google-beta/services/vpcaccess/data_source_vpc_access_connector_test.go +++ b/google-beta/services/vpcaccess/data_source_vpc_access_connector_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go b/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go index 06e4cccd94..5dd706b35a 100644 --- a/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go +++ b/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/vpcaccess/resource_vpc_access_connector_test.go b/google-beta/services/vpcaccess/resource_vpc_access_connector_test.go index 5ad6370321..58ff548d85 100644 --- a/google-beta/services/vpcaccess/resource_vpc_access_connector_test.go +++ b/google-beta/services/vpcaccess/resource_vpc_access_connector_test.go @@ -5,7 +5,7 @@ package vpcaccess_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/workbench/iam_workbench_instance_generated_test.go b/google-beta/services/workbench/iam_workbench_instance_generated_test.go index 3aa83cce6b..db3e8a3587 100644 --- a/google-beta/services/workbench/iam_workbench_instance_generated_test.go +++ b/google-beta/services/workbench/iam_workbench_instance_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/workbench/resource_workbench_instance_generated_test.go b/google-beta/services/workbench/resource_workbench_instance_generated_test.go index 6624abbad1..bd71126f55 100644 --- a/google-beta/services/workbench/resource_workbench_instance_generated_test.go +++ b/google-beta/services/workbench/resource_workbench_instance_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/workbench/resource_workbench_instance_shielded_config_test.go b/google-beta/services/workbench/resource_workbench_instance_shielded_config_test.go index 2ad5dc0d72..1eab07f885 100644 --- a/google-beta/services/workbench/resource_workbench_instance_shielded_config_test.go +++ b/google-beta/services/workbench/resource_workbench_instance_shielded_config_test.go @@ -5,7 +5,7 @@ package workbench_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/workbench/resource_workbench_instance_test.go b/google-beta/services/workbench/resource_workbench_instance_test.go index 324af68b0a..f5d6585857 100644 --- a/google-beta/services/workbench/resource_workbench_instance_test.go +++ b/google-beta/services/workbench/resource_workbench_instance_test.go @@ -5,7 +5,7 @@ package workbench_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" ) diff --git a/google-beta/services/workflows/resource_workflows_workflow_generated_test.go b/google-beta/services/workflows/resource_workflows_workflow_generated_test.go index 55dc518ed6..0813382fa6 100644 --- a/google-beta/services/workflows/resource_workflows_workflow_generated_test.go +++ b/google-beta/services/workflows/resource_workflows_workflow_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/workflows/resource_workflows_workflow_test.go b/google-beta/services/workflows/resource_workflows_workflow_test.go index 848cd489af..9e5df52e3a 100644 --- a/google-beta/services/workflows/resource_workflows_workflow_test.go +++ b/google-beta/services/workflows/resource_workflows_workflow_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workflows" diff --git a/google-beta/services/workstations/iam_workstations_workstation_config_generated_test.go b/google-beta/services/workstations/iam_workstations_workstation_config_generated_test.go index 944c43763a..c66222fae5 100644 --- a/google-beta/services/workstations/iam_workstations_workstation_config_generated_test.go +++ b/google-beta/services/workstations/iam_workstations_workstation_config_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/workstations/iam_workstations_workstation_generated_test.go b/google-beta/services/workstations/iam_workstations_workstation_generated_test.go index 64ee2cd5c4..7a67644232 100644 --- a/google-beta/services/workstations/iam_workstations_workstation_generated_test.go +++ b/google-beta/services/workstations/iam_workstations_workstation_generated_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go b/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go index 3ad1ed7330..0501173c1f 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/workstations/resource_workstations_workstation_cluster_test.go b/google-beta/services/workstations/resource_workstations_workstation_cluster_test.go index c9af8e63cc..535b0a0e45 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_cluster_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_cluster_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstationCluster_update(t *testing.T) { diff --git a/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go b/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go index 5363572dca..3937acd231 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" diff --git a/google-beta/services/workstations/resource_workstations_workstation_config_test.go b/google-beta/services/workstations/resource_workstations_workstation_config_test.go index 04ef69b7cb..91459cb5c8 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_config_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstationConfig_basic(t *testing.T) { diff --git a/google-beta/services/workstations/resource_workstations_workstation_generated_test.go b/google-beta/services/workstations/resource_workstations_workstation_generated_test.go index a123f39d2d..aaa24bd046 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_generated_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_generated_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" diff --git a/google-beta/services/workstations/resource_workstations_workstation_test.go b/google-beta/services/workstations/resource_workstations_workstation_test.go index 56fb1b58cf..25a88db748 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccWorkstationsWorkstation_update(t *testing.T) { diff --git a/google-beta/sweeper/gcp_sweeper.go b/google-beta/sweeper/gcp_sweeper.go index b6649a9dfd..a0808ffb88 100644 --- a/google-beta/sweeper/gcp_sweeper.go +++ b/google-beta/sweeper/gcp_sweeper.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/sweeper/gcp_sweeper_test.go b/google-beta/sweeper/gcp_sweeper_test.go index add0c9a0a5..508240d38d 100644 --- a/google-beta/sweeper/gcp_sweeper_test.go +++ b/google-beta/sweeper/gcp_sweeper_test.go @@ -5,7 +5,7 @@ package sweeper_test import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" _ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accessapproval" _ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager" diff --git a/google-beta/tpgresource/resource_test_utils.go b/google-beta/tpgresource/resource_test_utils.go index 158ed9e1a9..562dc4fc6b 100644 --- a/google-beta/tpgresource/resource_test_utils.go +++ b/google-beta/tpgresource/resource_test_utils.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-plugin-testing/terraform" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" )