Skip to content

Commit

Permalink
Revert "Fix google_dns_managed_zone update" (#12976) (#3409)
Browse files Browse the repository at this point in the history
[upstream:15606f551d2ef7964adb84f69504885d96172887]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Feb 5, 2025
1 parent 6587c01 commit c6dc2a6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/hashicorp/hcl/v2 v2.20.1
github.com/hashicorp/terraform-json v0.22.1
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250205212117-7c16650d6985
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250205222343-b64d45662d8f
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh
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-provider-google-beta v1.20.1-0.20250205212117-7c16650d6985 h1:4zYolVM8jifHuOTxf6l0OBomICJxaDfcGPtWPcx5v7w=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250205212117-7c16650d6985/go.mod h1:IkJf/cFmSb0kvMORnXqL/PqiMSLMSAuOKHzH60Fea58=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250205222343-b64d45662d8f h1:kPRt01hpKXdfb0siIiPPuE+zFri4nzRgEg/x/p4OpYI=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250205222343-b64d45662d8f/go.mod h1:IkJf/cFmSb0kvMORnXqL/PqiMSLMSAuOKHzH60Fea58=
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=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,7 @@ func expandDNSManagedZoneServiceDirectoryConfigNamespaceNamespaceUrl(v interface
} else if strings.HasPrefix(v.(string), "https://") {
return v, nil
}
// v1 is the only version in use
url, err := tpgresource.ReplaceVars(d, config, "https://servicedirectory.googleapis.com/v1/"+v.(string))
url, err := tpgresource.ReplaceVars(d, config, "{{ServiceDirectoryBasePath}}"+v.(string))
if err != nil {
return "", err
}
Expand Down

0 comments on commit c6dc2a6

Please sign in to comment.